| Index: media/base/simd/convert_yuv_to_rgb_c.cc
|
| diff --git a/media/base/simd/convert_yuv_to_rgb_c.cc b/media/base/simd/convert_yuv_to_rgb_c.cc
|
| index e09ed137405638880051f1cb3ae4cfd5f32c57ed..f04a89dbf9c7eb97825a37ff5ddf5c35164fca0f 100644
|
| --- a/media/base/simd/convert_yuv_to_rgb_c.cc
|
| +++ b/media/base/simd/convert_yuv_to_rgb_c.cc
|
| @@ -5,6 +5,8 @@
|
| #include "media/base/simd/convert_yuv_to_rgb.h"
|
| #include "media/base/simd/yuv_to_rgb_table.h"
|
|
|
| +namespace media {
|
| +
|
| #define packuswb(x) ((x) < 0 ? 0 : ((x) > 255 ? 255 : (x)))
|
| #define paddsw(x, y) (((x) + (y)) < -32768 ? -32768 : \
|
| (((x) + (y)) > 32767 ? 32767 : ((x) + (y))))
|
| @@ -67,8 +69,6 @@ static inline void ConvertYUVAToARGB_C(uint8 y,
|
| *reinterpret_cast<uint32*>(rgb_buf) = b | (g << 8) | (r << 16) | (a << 24);
|
| }
|
|
|
| -extern "C" {
|
| -
|
| void ConvertYUVToRGB32Row_C(const uint8* y_buf,
|
| const uint8* u_buf,
|
| const uint8* v_buf,
|
| @@ -181,10 +181,6 @@ void LinearScaleYUVToRGB32RowWithRange_C(const uint8* y_buf,
|
| }
|
| }
|
|
|
| -}
|
| -
|
| -namespace media {
|
| -
|
| void ConvertYUVToRGB32_C(const uint8* yplane,
|
| const uint8* uplane,
|
| const uint8* vplane,
|
|
|