| Index: webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc
|
| diff --git a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc
|
| index f6eaf0257b63be86937c75b0edbc087c26ca9f4d..aa54bdf0a5ecfcaef50cda07241db2f421dac0f2 100644
|
| --- a/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc
|
| +++ b/webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc
|
| @@ -931,14 +931,16 @@ int VP9DecoderImpl::Decode(const EncodedImage& input_image,
|
| // It may be released by libvpx during future vpx_codec_decode or
|
| // vpx_codec_destroy calls.
|
| img = vpx_codec_get_frame(decoder_, &iter);
|
| - int ret = ReturnFrame(img, input_image._timeStamp);
|
| + int ret = ReturnFrame(img, input_image._timeStamp, input_image.ntp_time_ms_);
|
| if (ret != 0) {
|
| return ret;
|
| }
|
| return WEBRTC_VIDEO_CODEC_OK;
|
| }
|
|
|
| -int VP9DecoderImpl::ReturnFrame(const vpx_image_t* img, uint32_t timestamp) {
|
| +int VP9DecoderImpl::ReturnFrame(const vpx_image_t* img,
|
| + uint32_t timestamp,
|
| + int64_t ntp_time_ms) {
|
| if (img == NULL) {
|
| // Decoder OK and NULL image => No show frame.
|
| return WEBRTC_VIDEO_CODEC_NO_OUTPUT;
|
| @@ -964,6 +966,7 @@ int VP9DecoderImpl::ReturnFrame(const vpx_image_t* img, uint32_t timestamp) {
|
|
|
| VideoFrame decoded_image(img_wrapped_buffer, timestamp,
|
| 0 /* render_time_ms */, webrtc::kVideoRotation_0);
|
| + decoded_image.set_ntp_time_ms(ntp_time_ms);
|
|
|
| int ret = decode_complete_callback_->Decoded(decoded_image);
|
| if (ret != 0)
|
|
|