Index: webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
index 41fd7ff3845a8eb91f48fda76f322280f6f1d0dc..0422ad9dff44714e65f60b3435ac664cb7d3b465 100644 |
--- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
+++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
@@ -878,6 +878,7 @@ int VP8EncoderImpl::GetEncodedPartitions(const VideoFrame& input_image) { |
encoded_images_[encoder_idx].capture_time_ms_ = |
input_image.render_time_ms(); |
encoded_images_[encoder_idx].rotation_ = input_image.rotation(); |
+ encoded_images_[encoder_idx].content_type_ = input_image.content_type(); |
int qp = -1; |
vpx_codec_control(&encoders_[encoder_idx], VP8E_GET_LAST_QUANTIZER_64, &qp); |
@@ -1124,7 +1125,8 @@ int VP8DecoderImpl::ReturnFrame(const vpx_image_t* img, |
buffer->MutableDataV(), buffer->StrideV(), |
img->d_w, img->d_h); |
- VideoFrame decoded_image(buffer, timestamp, 0, kVideoRotation_0); |
+ VideoFrame decoded_image(buffer, timestamp, 0, kVideoRotation_0, |
+ VideoContentType::kDefault); |
decoded_image.set_ntp_time_ms(ntp_time_ms); |
decode_complete_callback_->Decoded(decoded_image, rtc::Optional<int32_t>(), |
rtc::Optional<uint8_t>(qp)); |