| Index: media/base/yuv_convert.cc
|
| diff --git a/media/base/yuv_convert.cc b/media/base/yuv_convert.cc
|
| index 893b53df147bf56f4a1b83ba1a9e5dab1683314d..d69cb452145ff94d9b52819ccb0397435455965a 100644
|
| --- a/media/base/yuv_convert.cc
|
| +++ b/media/base/yuv_convert.cc
|
| @@ -59,7 +59,8 @@ typedef void (*ConvertYUVToRGB32Proc)(const uint8*,
|
| int,
|
| int,
|
| int,
|
| - YUVType);
|
| + YUVType,
|
| + YUVRange);
|
|
|
| typedef void (*ConvertYUVAToARGBProc)(const uint8*,
|
| const uint8*,
|
| @@ -72,7 +73,8 @@ typedef void (*ConvertYUVAToARGBProc)(const uint8*,
|
| int,
|
| int,
|
| int,
|
| - YUVType);
|
| + YUVType,
|
| + YUVRange);
|
|
|
| typedef void (*ConvertYUVToRGB32RowProc)(const uint8*,
|
| const uint8*,
|
| @@ -201,6 +203,7 @@ void ScaleYUVToRGB32(const uint8* y_buf,
|
| int uv_pitch,
|
| int rgb_pitch,
|
| YUVType yuv_type,
|
| + YUVRange yuv_range,
|
| Rotate view_rotate,
|
| ScaleFilter filter) {
|
| // Handle zero sized sources and destinations.
|
| @@ -612,7 +615,8 @@ void ConvertYUVToRGB32(const uint8* yplane,
|
| int ystride,
|
| int uvstride,
|
| int rgbstride,
|
| - YUVType yuv_type) {
|
| + YUVType yuv_type,
|
| + YUVRange yuv_range) {
|
| g_convert_yuv_to_rgb32_proc_(yplane,
|
| uplane,
|
| vplane,
|
| @@ -622,7 +626,8 @@ void ConvertYUVToRGB32(const uint8* yplane,
|
| ystride,
|
| uvstride,
|
| rgbstride,
|
| - yuv_type);
|
| + yuv_type,
|
| + yuv_range);
|
| }
|
|
|
| void ConvertYUVAToARGB(const uint8* yplane,
|
| @@ -636,7 +641,8 @@ void ConvertYUVAToARGB(const uint8* yplane,
|
| int uvstride,
|
| int astride,
|
| int rgbstride,
|
| - YUVType yuv_type) {
|
| + YUVType yuv_type,
|
| + YUVRange yuv_range) {
|
| g_convert_yuva_to_argb_proc_(yplane,
|
| uplane,
|
| vplane,
|
| @@ -648,7 +654,8 @@ void ConvertYUVAToARGB(const uint8* yplane,
|
| uvstride,
|
| astride,
|
| rgbstride,
|
| - yuv_type);
|
| + yuv_type,
|
| + yuv_range);
|
| }
|
|
|
| } // namespace media
|
|
|