Chromium Code Reviews| Index: webrtc/test/testsupport/frame_reader.h |
| diff --git a/webrtc/test/testsupport/frame_reader.h b/webrtc/test/testsupport/frame_reader.h |
| index 13800cdc6fe08c91e12c5a5b42fdbbb121277e3b..d0b3fe4cb03409639db887c180f81a876926d590 100644 |
| --- a/webrtc/test/testsupport/frame_reader.h |
| +++ b/webrtc/test/testsupport/frame_reader.h |
| @@ -46,14 +46,14 @@ class FrameReader { |
| virtual int NumberOfFrames() = 0; |
| }; |
| -class FrameReaderImpl : public FrameReader { |
| +class YuvFrameReaderImpl : public FrameReader { |
| public: |
| // Creates a file handler. The input file is assumed to exist and be readable. |
| // Parameters: |
| // input_filename The file to read from. |
| // width, height Size of each frame to read. |
| - FrameReaderImpl(std::string input_filename, int width, int height); |
| - ~FrameReaderImpl() override; |
| + YuvFrameReaderImpl(std::string input_filename, int width, int height); |
| + virtual ~YuvFrameReaderImpl() override; |
|
sprang_webrtc
2017/02/17 10:08:22
"virtual" only in the base class, all subclasses j
brandtr
2017/02/20 13:17:31
Done.
|
| bool Init() override; |
| rtc::scoped_refptr<I420Buffer> ReadFrame() override; |
| void Close() override; |
| @@ -61,10 +61,10 @@ class FrameReaderImpl : public FrameReader { |
| int NumberOfFrames() override; |
| private: |
| - std::string input_filename_; |
| + const std::string input_filename_; |
| size_t frame_length_in_bytes_; |
| - int width_; |
| - int height_; |
| + const int width_; |
| + const int height_; |
| int number_of_frames_; |
| FILE* input_file_; |
| }; |