diff options
| author | fbarchard <fbarchard@google.com> | 2015-09-10 16:09:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-10 23:11:08 +0000 |
| commit | 4a631b1ad97bb1284f1211f109338ecb6464a0b4 (patch) | |
| tree | c5f15668b50804143813e242d9e44146edc9596b /media | |
| parent | a553c789fb5cd49f3f647c452152b7645a55b7f7 (diff) | |
| download | chromium_src-4a631b1ad97bb1284f1211f109338ecb6464a0b4.zip chromium_src-4a631b1ad97bb1284f1211f109338ecb6464a0b4.tar.gz chromium_src-4a631b1ad97bb1284f1211f109338ecb6464a0b4.tar.bz2 | |
roll libyuv r1480 to r1481
r1481 re-enables AVX2 for YUV to RGB conversions.
BUG=libyuv:472,libyuv:489,libyuv:488
Review URL: https://codereview.chromium.org/1321503004
Cr-Commit-Position: refs/heads/master@{#348276}
Diffstat (limited to 'media')
| -rw-r--r-- | media/blink/skcanvas_video_renderer.cc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/media/blink/skcanvas_video_renderer.cc b/media/blink/skcanvas_video_renderer.cc index 7385e5c..14792ff 100644 --- a/media/blink/skcanvas_video_renderer.cc +++ b/media/blink/skcanvas_video_renderer.cc @@ -28,12 +28,14 @@ #define LIBYUV_I422_TO_ARGB libyuv::I422ToARGB #define LIBYUV_I420ALPHA_TO_ARGB libyuv::I420AlphaToARGB #define LIBYUV_J420_TO_ARGB libyuv::J420ToARGB +#define LIBYUV_H420_TO_ARGB libyuv::H420ToARGB #elif SK_R32_SHIFT == 0 && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16 && \ SK_A32_SHIFT == 24 #define LIBYUV_I420_TO_ARGB libyuv::I420ToABGR #define LIBYUV_I422_TO_ARGB libyuv::I422ToABGR #define LIBYUV_I420ALPHA_TO_ARGB libyuv::I420AlphaToABGR #define LIBYUV_J420_TO_ARGB libyuv::J420ToABGR +#define LIBYUV_H420_TO_ARGB libyuv::H420ToABGR #else #error Unexpected Skia ARGB_8888 layout! #endif @@ -435,15 +437,17 @@ void SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels( video_frame->visible_rect().width(), video_frame->visible_rect().height()); } else if (CheckColorSpace(video_frame, COLOR_SPACE_HD_REC709)) { - ConvertYUVToRGB32(video_frame->visible_data(VideoFrame::kYPlane), - video_frame->visible_data(VideoFrame::kUPlane), - video_frame->visible_data(VideoFrame::kVPlane), - static_cast<uint8*>(rgb_pixels), - video_frame->visible_rect().width(), - video_frame->visible_rect().height(), - video_frame->stride(VideoFrame::kYPlane), - video_frame->stride(VideoFrame::kUPlane), row_bytes, - YV12HD); + LIBYUV_H420_TO_ARGB( + video_frame->visible_data(VideoFrame::kYPlane), + video_frame->stride(VideoFrame::kYPlane), + video_frame->visible_data(VideoFrame::kUPlane), + video_frame->stride(VideoFrame::kUPlane), + video_frame->visible_data(VideoFrame::kVPlane), + video_frame->stride(VideoFrame::kVPlane), + static_cast<uint8*>(rgb_pixels), + row_bytes, + video_frame->visible_rect().width(), + video_frame->visible_rect().height()); } else { LIBYUV_I420_TO_ARGB( video_frame->visible_data(VideoFrame::kYPlane), |