generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "fixes --disable-vp9-encoder" into vp9-preview

Browse Source
This commit is contained in:
Jim Bankoski 2012-12-03 12:41:30 -08:00 committed by Gerrit Code Review
commit b95338c7ab
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
vp9/common/x86/vp9_asm_stubs.c
View File

@ -97,6 +97,29 @@ extern void vp9_filter_block1d8_v6_only_sse2(unsigned char *src_ptr,
extern prototype_subpixel_predict(vp9_bilinear_predict8x8_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 }
};
#if HAVE_MMX
void vp9_sixtap_predict4x4_mmx(unsigned char *src_ptr,
int src_pixels_per_line,

26
vp9/encoder/x86/vp9_variance_mmx.c
View File

@ -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
(