From cdf1f28c8ebec974caec3858b46d9f806040c48b Mon Sep 17 00:00:00 2001 From: "rileya@chromium.org" Date: Wed, 4 Dec 2013 04:15:11 +0000 Subject: Add plumbing for video pixel formats with JPEG color range. BUG=310273 Review URL: https://codereview.chromium.org/88403004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238559 0039d316-1c4b-4281-b951-d872f2087c98 --- media/ffmpeg/ffmpeg_common.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'media/ffmpeg') diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index 905e8d9..40696c6 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -513,12 +513,10 @@ VideoFrame::Format PixelFormatToVideoFormat(PixelFormat pixel_format) { switch (pixel_format) { case PIX_FMT_YUV422P: return VideoFrame::YV16; - // TODO(scherkus): We should be paying attention to the color range of each - // format and scaling as appropriate when rendering. Regular YUV has a range - // of 16-239 where as YUVJ has a range of 0-255. case PIX_FMT_YUV420P: - case PIX_FMT_YUVJ420P: return VideoFrame::YV12; + case PIX_FMT_YUVJ420P: + return VideoFrame::YV12J; case PIX_FMT_YUVA420P: return VideoFrame::YV12A; default: @@ -533,6 +531,8 @@ PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format) { return PIX_FMT_YUV422P; case VideoFrame::YV12: return PIX_FMT_YUV420P; + case VideoFrame::YV12J: + return PIX_FMT_YUVJ420P; case VideoFrame::YV12A: return PIX_FMT_YUVA420P; default: -- cgit v1.1