diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2012-12-03 12:41:30 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-12-03 12:41:31 -0800 |
| commit | b95338c7abd1e70d43b972f9a4661ef0b6e2a5aa (patch) | |
| tree | b4827f733f66312c8f0e8a939b7f771138461ce1 /vp9/encoder/x86 | |
| parent | 3e0ea7f6e1cec3c785312a140a72b120ff831ff0 (diff) | |
| parent | d9038b3c600d39ce7a4b01e0c8c71bbe9d975fb0 (diff) | |
| download | libvpx-b95338c7abd1e70d43b972f9a4661ef0b6e2a5aa.tar libvpx-b95338c7abd1e70d43b972f9a4661ef0b6e2a5aa.tar.gz libvpx-b95338c7abd1e70d43b972f9a4661ef0b6e2a5aa.tar.bz2 libvpx-b95338c7abd1e70d43b972f9a4661ef0b6e2a5aa.zip | |
Merge "fixes --disable-vp9-encoder" into vp9-preview
Diffstat (limited to 'vp9/encoder/x86')
| -rw-r--r-- | vp9/encoder/x86/vp9_variance_mmx.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/vp9/encoder/x86/vp9_variance_mmx.c b/vp9/encoder/x86/vp9_variance_mmx.c index fa69130a1..dd3dfbc08 100644 --- a/vp9/encoder/x86/vp9_variance_mmx.c +++ b/vp9/encoder/x86/vp9_variance_mmx.c @@ -191,31 +191,7 @@ unsigned int vp9_variance8x16_mmx( } - - - -/////////////////////////////////////////////////////////////////////////// -// the mmx function that does the bilinear filtering and var calculation // -// int one pass // -/////////////////////////////////////////////////////////////////////////// -DECLARE_ALIGNED(16, const short, vp9_bilinear_filters_mmx[16][8]) = { - { 128, 128, 128, 128, 0, 0, 0, 0 }, - { 120, 120, 120, 120, 8, 8, 8, 8 }, - { 112, 112, 112, 112, 16, 16, 16, 16 }, - { 104, 104, 104, 104, 24, 24, 24, 24 }, - { 96, 96, 96, 96, 32, 32, 32, 32 }, - { 88, 88, 88, 88, 40, 40, 40, 40 }, - { 80, 80, 80, 80, 48, 48, 48, 48 }, - { 72, 72, 72, 72, 56, 56, 56, 56 }, - { 64, 64, 64, 64, 64, 64, 64, 64 }, - { 56, 56, 56, 56, 72, 72, 72, 72 }, - { 48, 48, 48, 48, 80, 80, 80, 80 }, - { 40, 40, 40, 40, 88, 88, 88, 88 }, - { 32, 32, 32, 32, 96, 96, 96, 96 }, - { 24, 24, 24, 24, 104, 104, 104, 104 }, - { 16, 16, 16, 16, 112, 112, 112, 112 }, - { 8, 8, 8, 8, 120, 120, 120, 120 } -}; +DECLARE_ALIGNED(16, const short, vp9_bilinear_filters_mmx[16][8]); unsigned int vp9_sub_pixel_variance4x4_mmx ( |