Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 50 | 50 |
| 51 virtual webrtc::EventWrapper* CreateEvent() { return new NullEvent; } | 51 virtual webrtc::EventWrapper* CreateEvent() { return new NullEvent; } |
| 52 }; | 52 }; |
| 53 | 53 |
| 54 class FileOutputFrameReceiver : public webrtc::VCMReceiveCallback { | 54 class FileOutputFrameReceiver : public webrtc::VCMReceiveCallback { |
| 55 public: | 55 public: |
| 56 FileOutputFrameReceiver(const std::string& base_out_filename, uint32_t ssrc); | 56 FileOutputFrameReceiver(const std::string& base_out_filename, uint32_t ssrc); |
| 57 virtual ~FileOutputFrameReceiver(); | 57 virtual ~FileOutputFrameReceiver(); |
| 58 | 58 |
| 59 // VCMReceiveCallback | 59 // VCMReceiveCallback |
| 60 virtual int32_t FrameToRender(webrtc::VideoFrame& video_frame); // NOLINT | 60 virtual int32_t FrameToRender(webrtc::VideoFrame& video_frame, |
| 61 int qp); // NOLINT | |
|
hbos
2017/01/25 11:31:12
Can you change virtual to override? If so do it ev
sakal
2017/01/25 12:39:34
Done for this method.
I don't want to touch other
hbos
2017/01/26 15:04:45
There might be waterfall bots that complain if a f
sakal
2017/01/26 15:46:52
I changed all methods to override and removed a fe
| |
| 61 | 62 |
| 62 private: | 63 private: |
| 63 std::string out_filename_; | 64 std::string out_filename_; |
| 64 FILE* out_file_; | 65 FILE* out_file_; |
| 65 FILE* timing_file_; | 66 FILE* timing_file_; |
| 66 int width_; | 67 int width_; |
| 67 int height_; | 68 int height_; |
| 68 int count_; | 69 int count_; |
| 69 | 70 |
| 70 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FileOutputFrameReceiver); | 71 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FileOutputFrameReceiver); |
| 71 }; | 72 }; |
| 72 | 73 |
| 73 class CmdArgs { | 74 class CmdArgs { |
| 74 public: | 75 public: |
| 75 CmdArgs(); | 76 CmdArgs(); |
| 76 | 77 |
| 77 std::string codecName; | 78 std::string codecName; |
| 78 webrtc::VideoCodecType codecType; | 79 webrtc::VideoCodecType codecType; |
| 79 int width; | 80 int width; |
| 80 int height; | 81 int height; |
| 81 int rtt; | 82 int rtt; |
| 82 std::string inputFile; | 83 std::string inputFile; |
| 83 std::string outputFile; | 84 std::string outputFile; |
| 84 }; | 85 }; |
| 85 | 86 |
| 86 #endif // WEBRTC_MODULES_VIDEO_CODING_TEST_TEST_UTIL_H_ | 87 #endif // WEBRTC_MODULES_VIDEO_CODING_TEST_TEST_UTIL_H_ |
| OLD | NEW |