summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-14 01:06:02 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-14 01:06:02 +0000
commit7758c234c30291995c01b79887b52a471362fcc3 (patch)
tree405c3ca0d8ba15ad7ed936d491741174adfbc706 /media
parentcaf09f737c0d48bca9c541130daf78ab40fe6953 (diff)
downloadchromium_src-7758c234c30291995c01b79887b52a471362fcc3.zip
chromium_src-7758c234c30291995c01b79887b52a471362fcc3.tar.gz
chromium_src-7758c234c30291995c01b79887b52a471362fcc3.tar.bz2
Revert 100916 - Fix build
Failed on official Linux 32 builder. (x486?) http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux/builds/11240/steps/compile/logs/stdio In file included from media/base/yuv_convert.cc:33: /usr/lib/gcc/i486-linux-gnu/4.4.3/include/emmintrin.h:32:3:error: #error "SSE2 instruction set not enabled" make: *** [out/Release/obj.target/yuv_convert/media/base/yuv_convert.o] Error 1 BUG=None TEST=None Review URL: http://codereview.chromium.org/7892009 TBR=hclam@chromium.org Review URL: http://codereview.chromium.org/7885020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/simd/convert_yuv_to_rgb_sse.asm17
-rw-r--r--media/base/simd/scale_yuv_to_rgb_sse.asm8
2 files changed, 25 insertions, 0 deletions
diff --git a/media/base/simd/convert_yuv_to_rgb_sse.asm b/media/base/simd/convert_yuv_to_rgb_sse.asm
index 2f1967a..28d2214 100644
--- a/media/base/simd/convert_yuv_to_rgb_sse.asm
+++ b/media/base/simd/convert_yuv_to_rgb_sse.asm
@@ -21,3 +21,20 @@
; int width);
%define SYMBOL ConvertYUVToRGB32Row_SSE
%include "convert_yuv_to_rgb_mmx.inc"
+
+; void ScaleYUVToRGB32Row_MMX(const uint8* y_buf,
+; const uint8* u_buf,
+; const uint8* v_buf,
+; uint8* rgb_buf,
+; int width,
+; int source_dx);
+%define SYMBOL ScaleYUVToRGB32Row_SSE
+%include "scale_yuv_to_rgb_mmx.inc"
+
+; void LinearScaleYUVToRGB32Row_MMX(const uint8* y_buf,
+; const uint8* u_buf,
+; const uint8* v_buf,
+; uint8* rgb_buf,
+; int width,
+; int source_dx);
+
diff --git a/media/base/simd/scale_yuv_to_rgb_sse.asm b/media/base/simd/scale_yuv_to_rgb_sse.asm
index 5b849a6..bdd5625 100644
--- a/media/base/simd/scale_yuv_to_rgb_sse.asm
+++ b/media/base/simd/scale_yuv_to_rgb_sse.asm
@@ -21,3 +21,11 @@
; int source_dx);
%define SYMBOL ScaleYUVToRGB32Row_SSE
%include "scale_yuv_to_rgb_mmx.inc"
+
+; void LinearScaleYUVToRGB32Row_SSE(const uint8* y_buf,
+; const uint8* u_buf,
+; const uint8* v_buf,
+; uint8* rgb_buf,
+; int width,
+; int source_dx);
+