diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 11:38:45 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 17:16:47 +0000 |
commit | 3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 (patch) | |
tree | 43cc572ba067417c7341db81f71ae7cc6e0fcc3e /chromium/third_party/webrtc/modules/video_coding/codecs/test | |
parent | f61ab1ac7f855cd281809255c0aedbb1895e1823 (diff) | |
download | qtwebengine-chromium-3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859.tar.gz |
BASELINE: Update chromium to 45.0.2454.40
Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/webrtc/modules/video_coding/codecs/test')
-rw-r--r-- | chromium/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.cc | 9 | ||||
-rw-r--r-- | chromium/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.h | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/chromium/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.cc b/chromium/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.cc index 10a3ff22598..e788f23b9de 100644 --- a/chromium/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.cc +++ b/chromium/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.cc @@ -292,7 +292,7 @@ void VideoProcessorImpl::FrameEncoded(const EncodedImage& encoded_image) { last_frame_missing_ = copied_image._length == 0; } -void VideoProcessorImpl::FrameDecoded(const I420VideoFrame& image) { +void VideoProcessorImpl::FrameDecoded(const VideoFrame& image) { TickTime decode_stop = TickTime::Now(); int frame_number = image.timestamp(); // Report stats @@ -312,7 +312,7 @@ void VideoProcessorImpl::FrameDecoded(const I420VideoFrame& image) { // upsample back to original size: needed for PSNR and SSIM computations. if (image.width() != config_.codec_settings->width || image.height() != config_.codec_settings->height) { - I420VideoFrame up_image; + VideoFrame up_image; int ret_val = scaler_.Set(image.width(), image.height(), config_.codec_settings->width, config_.codec_settings->height, @@ -404,9 +404,8 @@ VideoProcessorImpl::VideoProcessorEncodeCompleteCallback::Encoded( video_processor_->FrameEncoded(encoded_image); // Forward to parent class. return 0; } -int32_t -VideoProcessorImpl::VideoProcessorDecodeCompleteCallback::Decoded( - I420VideoFrame& image) { +int32_t VideoProcessorImpl::VideoProcessorDecodeCompleteCallback::Decoded( + VideoFrame& image) { video_processor_->FrameDecoded(image); // forward to parent class return 0; } diff --git a/chromium/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.h b/chromium/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.h index cf55b75e61b..186b84066a1 100644 --- a/chromium/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.h +++ b/chromium/third_party/webrtc/modules/video_coding/codecs/test/videoprocessor.h @@ -170,7 +170,7 @@ class VideoProcessorImpl : public VideoProcessor { // Invoked by the callback when a frame has completed encoding. void FrameEncoded(const webrtc::EncodedImage& encodedImage); // Invoked by the callback when a frame has completed decoding. - void FrameDecoded(const webrtc::I420VideoFrame& image); + 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, @@ -199,7 +199,7 @@ class VideoProcessorImpl : public VideoProcessor { // Keep track of the last successful frame, since we need to write that // when decoding fails: uint8_t* last_successful_frame_buffer_; - webrtc::I420VideoFrame source_frame_; + webrtc::VideoFrame source_frame_; // To keep track of if we have excluded the first key frame from packet loss: bool first_key_frame_has_been_excluded_; // To tell the decoder previous frame have been dropped due to packet loss: @@ -241,7 +241,7 @@ class VideoProcessorImpl : public VideoProcessor { explicit VideoProcessorDecodeCompleteCallback(VideoProcessorImpl* vp) : video_processor_(vp) { } - int32_t Decoded(webrtc::I420VideoFrame& image) override; + int32_t Decoded(webrtc::VideoFrame& image) override; private: VideoProcessorImpl* video_processor_; |