Chromium Code Reviews| Index: webrtc/modules/video_coding/codecs/test/videoprocessor.h |
| diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.h b/webrtc/modules/video_coding/codecs/test/videoprocessor.h |
| index cd1c7b9d62c976adec279e0ea49e2c1d1605f536..c8daf6560e4aac4b46bacb9f0b1ea021c23639b2 100644 |
| --- a/webrtc/modules/video_coding/codecs/test/videoprocessor.h |
| +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.h |
| @@ -19,7 +19,6 @@ |
| #include "webrtc/modules/video_coding/include/video_codec_interface.h" |
| #include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" |
| #include "webrtc/modules/video_coding/codecs/test/stats.h" |
| -#include "webrtc/system_wrappers/include/tick_util.h" |
| #include "webrtc/test/testsupport/frame_reader.h" |
| #include "webrtc/test/testsupport/frame_writer.h" |
| #include "webrtc/video_frame.h" |
| @@ -179,8 +178,8 @@ class VideoProcessorImpl : public VideoProcessor { |
| void FrameDecoded(const webrtc::VideoFrame& image); |
| // Used for getting a 32-bit integer representing time |
| // (checks the size is within signed 32-bit bounds before casting it) |
| - int GetElapsedTimeMicroseconds(const webrtc::TickTime& start, |
| - const webrtc::TickTime& stop); |
| + int GetElapsedTimeMicroseconds(int64_t start, |
| + int64_t stop); |
|
stefan-webrtc
2016/04/19 09:19:12
git cl format
nisse-webrtc
2016/04/19 12:19:25
Fixing this. Not doing a cl format of all the cl u
|
| // Updates the encoder with the target bit rate and the frame rate. |
| void SetRates(int bit_rate, int frame_rate) override; |
| // Return the size of the encoded frame in bytes. |
| @@ -225,8 +224,8 @@ class VideoProcessorImpl : public VideoProcessor { |
| // Statistics |
| double bit_rate_factor_; // multiply frame length with this to get bit rate |
| - webrtc::TickTime encode_start_; |
| - webrtc::TickTime decode_start_; |
| + int64_t encode_start_; |
| + int64_t decode_start_; |
|
stefan-webrtc
2016/04/19 09:19:12
Units
nisse-webrtc
2016/04/19 12:19:25
Done.
|
| // Callback class required to implement according to the VideoEncoder API. |
| class VideoProcessorEncodeCompleteCallback |