diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-04-28 00:05:07 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-04-28 00:05:07 -0400 |
| commit | e1b90ce862b6989d8ad755ffbbd9d59849d93a4f (patch) | |
| tree | e4517530e46531457dbc37df11edeb5bb75b7921 /vp8/common/x86/recon_x86.h | |
| parent | 9d325df746cd79f434cea45768b38dc49b61e3aa (diff) | |
| parent | 2e102855f4f69148d17771f584c26e1498ec82e2 (diff) | |
| download | libvpx-e1b90ce862b6989d8ad755ffbbd9d59849d93a4f.tar libvpx-e1b90ce862b6989d8ad755ffbbd9d59849d93a4f.tar.gz libvpx-e1b90ce862b6989d8ad755ffbbd9d59849d93a4f.tar.bz2 libvpx-e1b90ce862b6989d8ad755ffbbd9d59849d93a4f.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/common/x86/recon_x86.h')
| -rw-r--r-- | vp8/common/x86/recon_x86.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/vp8/common/x86/recon_x86.h b/vp8/common/x86/recon_x86.h index 40ee65a12..fe0f8f0bc 100644 --- a/vp8/common/x86/recon_x86.h +++ b/vp8/common/x86/recon_x86.h @@ -46,6 +46,8 @@ extern prototype_copy_block(vp8_copy_mem16x16_mmx); extern prototype_recon_block(vp8_recon2b_sse2); extern prototype_recon_block(vp8_recon4b_sse2); extern prototype_copy_block(vp8_copy_mem16x16_sse2); +extern prototype_build_intra_predictors(vp8_build_intra_predictors_mbuv_sse2); +extern prototype_build_intra_predictors(vp8_build_intra_predictors_mbuv_s_sse2); #if !CONFIG_RUNTIME_CPU_DETECT #undef vp8_recon_recon2 @@ -57,6 +59,26 @@ extern prototype_copy_block(vp8_copy_mem16x16_sse2); #undef vp8_recon_copy16x16 #define vp8_recon_copy16x16 vp8_copy_mem16x16_sse2 +#undef vp8_recon_build_intra_predictors_mbuv +#define vp8_recon_build_intra_predictors_mbuv vp8_build_intra_predictors_mbuv_sse2 + +#undef vp8_recon_build_intra_predictors_mbuv_s +#define vp8_recon_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_sse2 + +#endif +#endif + +#if HAVE_SSSE3 +extern prototype_build_intra_predictors(vp8_build_intra_predictors_mbuv_ssse3); +extern prototype_build_intra_predictors(vp8_build_intra_predictors_mbuv_s_ssse3); + +#if !CONFIG_RUNTIME_CPU_DETECT +#undef vp8_recon_build_intra_predictors_mbuv +#define vp8_recon_build_intra_predictors_mbuv vp8_build_intra_predictors_mbuv_ssse3 + +#undef vp8_recon_build_intra_predictors_mbuv_s +#define vp8_recon_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_ssse3 + #endif #endif #endif |