| Index: media/ffmpeg/ffmpeg_common.cc
|
| diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
|
| index f817547006fbfdd5ffe887d7a4abd573a6ca9dd5..2c99e7e70146b3642c1e2548297d38b419c83122 100644
|
| --- a/media/ffmpeg/ffmpeg_common.cc
|
| +++ b/media/ffmpeg/ffmpeg_common.cc
|
| @@ -407,6 +407,12 @@ void AVStreamToVideoDecoderConfig(
|
| coded_size = visible_rect.size();
|
| }
|
|
|
| + // YV12 frames may be in HD color space.
|
| + if (format == VideoFrame::YV12 &&
|
| + stream->codec->colorspace == AVCOL_SPC_BT709) {
|
| + format = VideoFrame::YV12HD;
|
| + }
|
| +
|
| // Pad out |coded_size| for subsampled YUV formats.
|
| if (format != VideoFrame::YV24) {
|
| coded_size.set_width((coded_size.width() + 1) / 2 * 2);
|
| @@ -546,6 +552,7 @@ PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format) {
|
| case VideoFrame::YV16:
|
| return PIX_FMT_YUV422P;
|
| case VideoFrame::YV12:
|
| + case VideoFrame::YV12HD:
|
| return PIX_FMT_YUV420P;
|
| case VideoFrame::YV12J:
|
| return PIX_FMT_YUVJ420P;
|
|
|