diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 02:13:10 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 02:13:10 +0000 |
| commit | 596026f49c473b458597e0a4dcd8220cad700c89 (patch) | |
| tree | c4788da50f5c4bce0942c033540830b17136d0bb /media/base/yuv_convert.cc | |
| parent | 70277f6b896c776999e356d6546d65fd999dea05 (diff) | |
| download | chromium_src-596026f49c473b458597e0a4dcd8220cad700c89.zip chromium_src-596026f49c473b458597e0a4dcd8220cad700c89.tar.gz chromium_src-596026f49c473b458597e0a4dcd8220cad700c89.tar.bz2 | |
fix arm warnings
BUG=19113
TEST=builds on arm
Review URL: http://codereview.chromium.org/1553033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44608 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/yuv_convert.cc')
| -rw-r--r-- | media/base/yuv_convert.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/media/base/yuv_convert.cc b/media/base/yuv_convert.cc index e9b8c59..b5ddf64 100644 --- a/media/base/yuv_convert.cc +++ b/media/base/yuv_convert.cc @@ -44,14 +44,14 @@ void ConvertYUVToRGB32(const uint8* y_buf, const uint8* u_buf, const uint8* v_buf, uint8* rgb_buf, - int source_width, - int source_height, + int width, + int height, int y_pitch, int uv_pitch, int rgb_pitch, YUVType yuv_type) { unsigned int y_shift = yuv_type; - for (int y = 0; y < source_height; ++y) { + for (int y = 0; y < height; ++y) { uint8* rgb_row = rgb_buf + y * rgb_pitch; const uint8* y_ptr = y_buf + y * y_pitch; const uint8* u_ptr = u_buf + (y >> y_shift) * uv_pitch; @@ -61,7 +61,7 @@ void ConvertYUVToRGB32(const uint8* y_buf, u_ptr, v_ptr, rgb_row, - source_width); + width); } // MMX used for FastConvertYUVToRGB32Row requires emms instruction. @@ -134,9 +134,6 @@ static void FilterRows(uint8* ybuf, const uint8* y0_ptr, const uint8* y1_ptr, int source_width, int source_y_fraction) { int y1_fraction = source_y_fraction >> 8; int y0_fraction = 256 - (source_y_fraction >> 8); - - int y0_fraction = kFractionMax - source_y_fraction; - int y1_fraction = source_y_fraction; uint8* end = ybuf + source_width; if (ybuf < end) { do { |