diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 17:16:40 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 17:16:40 +0000 |
| commit | 9a3b5d1342e41b430e0e20221fd3f74b44a5fb47 (patch) | |
| tree | 07a40682534e49de311b53fbca0ec26096feeb23 /media | |
| parent | dcc6432defe5e686ee152926613e14cd0e07e175 (diff) | |
| download | chromium_src-9a3b5d1342e41b430e0e20221fd3f74b44a5fb47.zip chromium_src-9a3b5d1342e41b430e0e20221fd3f74b44a5fb47.tar.gz chromium_src-9a3b5d1342e41b430e0e20221fd3f74b44a5fb47.tar.bz2 | |
allow yuv scaling fpic code to be used on linux, as well as Mac
BUG=51333
TEST=build chrome with linux_fpic=1
Review URL: http://codereview.chromium.org/3073029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/yuv_row_posix.cc | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/media/base/yuv_row_posix.cc b/media/base/yuv_row_posix.cc index c38ac1f..306d3d7 100644 --- a/media/base/yuv_row_posix.cc +++ b/media/base/yuv_row_posix.cc @@ -269,7 +269,6 @@ void FastConvertYUVToRGB32Row(const uint8* y_buf, const uint8* v_buf, uint8* rgb_buf, int width); - asm( ".global FastConvertYUVToRGB32Row\n" "FastConvertYUVToRGB32Row:\n" @@ -329,7 +328,6 @@ void ScaleYUVToRGB32Row(const uint8* y_buf, uint8* rgb_buf, int width, int source_dx); - asm( ".global ScaleYUVToRGB32Row\n" "ScaleYUVToRGB32Row:\n" @@ -403,7 +401,6 @@ void LinearScaleYUVToRGB32Row(const uint8* y_buf, uint8* rgb_buf, int width, int source_dx); - asm( ".global LinearScaleYUVToRGB32Row\n" "LinearScaleYUVToRGB32Row:\n" @@ -516,8 +513,13 @@ extern void PICConvertYUVToRGB32Row(const uint8* y_buf, uint8* rgb_buf, int width, int16 *kCoefficientsRgbY); - __asm__( + asm( + +#if defined(OS_MACOSX) "_PICConvertYUVToRGB32Row:\n" +#else +"PICConvertYUVToRGB32Row:\n" +#endif "pusha\n" "mov 0x24(%esp),%edx\n" "mov 0x28(%esp),%edi\n" @@ -585,8 +587,12 @@ extern void PICScaleYUVToRGB32Row(const uint8* y_buf, int source_dx, int16 *kCoefficientsRgbY); - __asm__( + asm( +#if defined(OS_MACOSX) "_PICScaleYUVToRGB32Row:\n" +#else +"PICScaleYUVToRGB32Row:\n" +#endif "pusha\n" "mov 0x24(%esp),%edx\n" "mov 0x28(%esp),%edi\n" @@ -669,9 +675,12 @@ void PICLinearScaleYUVToRGB32Row(const uint8* y_buf, int width, int source_dx, int16 *kCoefficientsRgbY); - asm( +#if defined(OS_MACOSX) "_PICLinearScaleYUVToRGB32Row:\n" +#else +"PICLinearScaleYUVToRGB32Row:\n" +#endif "pusha\n" "mov 0x24(%esp),%edx\n" "mov 0x30(%esp),%ebp\n" @@ -830,7 +839,7 @@ static inline void YuvPixel(uint8 y, uint8 v, uint8* rgb_buf) { - __asm { + asm { movzx eax, u movq mm0, [kCoefficientsRgbY+2048 + 8 * eax] movzx eax, v |