Chromium Code Reviews| Index: media/filters/skcanvas_video_renderer.cc |
| diff --git a/media/filters/skcanvas_video_renderer.cc b/media/filters/skcanvas_video_renderer.cc |
| index 2243445d459e903f6d230604a757f6c36cc4c0cb..3d6a380a9b6351fffc13c9084d7fcef8787c5163 100644 |
| --- a/media/filters/skcanvas_video_renderer.cc |
| +++ b/media/filters/skcanvas_video_renderer.cc |
| @@ -44,6 +44,7 @@ bool IsYUV(media::VideoFrame::Format format) { |
| case VideoFrame::I420: |
| case VideoFrame::YV12A: |
| case VideoFrame::YV12J: |
| + case VideoFrame::YV12HD: |
| case VideoFrame::YV24: |
| case VideoFrame::NV12: |
| return true; |
| @@ -63,6 +64,7 @@ bool IsJPEGColorSpace(media::VideoFrame::Format format) { |
| case VideoFrame::YV12J: |
| return true; |
| case VideoFrame::YV12: |
| + case VideoFrame::YV12HD: |
| case VideoFrame::YV16: |
| case VideoFrame::I420: |
| case VideoFrame::YV12A: |
| @@ -141,6 +143,18 @@ void ConvertVideoFrameToRGBPixels( |
| media::YV12J); |
| break; |
| + case media::VideoFrame::YV12HD: |
| + media::ConvertYUVToRGB32( |
| + video_frame->data(media::VideoFrame::kYPlane) + y_offset, |
| + video_frame->data(media::VideoFrame::kUPlane) + uv_offset, |
| + video_frame->data(media::VideoFrame::kVPlane) + uv_offset, |
| + static_cast<uint8*>(rgb_pixels), video_frame->visible_rect().width(), |
| + video_frame->visible_rect().height(), |
| + video_frame->stride(media::VideoFrame::kYPlane), |
| + video_frame->stride(media::VideoFrame::kUPlane), row_bytes, |
| + media::YV12HD); |
| + break; |
| + |
| case media::VideoFrame::YV16: |
| LIBYUV_I422_TO_ARGB( |
| video_frame->data(media::VideoFrame::kYPlane) + y_offset, |
| @@ -208,9 +222,9 @@ void ConvertVideoFrameToRGBPixels( |
| video_frame->ReadPixelsFromNativeTexture(tmp); |
| break; |
| } |
| - default: |
| + case VideoFrame::UNKNOWN: |
| + case VideoFrame::NV12: |
| NOTREACHED(); |
| - break; |
| } |
| } |
| @@ -253,8 +267,10 @@ class VideoImageGenerator : public SkImageGenerator { |
| void* planes[3], |
| size_t row_bytes[3], |
| SkYUVColorSpace* color_space) override { |
| - if (!frame_.get() || !IsYUV(frame_->format())) |
| + if (!frame_.get() || !IsYUV(frame_->format()) || |
| + frame_->format() == VideoFrame::YV12HD) { |
|
DaleCurtis
2015/01/08 01:36:57
Is this a TODO?
rileya (GONE FROM CHROMIUM)
2015/01/12 21:46:21
Yep! Lost it somewhere in the rebase-ing process..
|
| return false; |
| + } |
| if (color_space) { |
| if (IsJPEGColorSpace(frame_->format())) |