virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

h264chroma: remove duplicate 9/10 bit functions.

Browse Source 
Also use the resulting 16bpp functions for anything >8 and <=16, not just
9 and 10. This fixes 12 and 14bpp H264 support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Ronald S. Bultje 2013-02-11 13:52:38 -08:00 committed by Michael Niedermayer
parent 0aa1d848ec
commit 972771dcf2
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/h264chroma.c
View File

@ -23,11 +23,7 @@
#include "h264chroma_template.c" #include "h264chroma_template.c"
#undef BIT_DEPTH #undef BIT_DEPTH
#define BIT_DEPTH 9 #define BIT_DEPTH 16
#include "h264chroma_template.c"
#undef BIT_DEPTH
#define BIT_DEPTH 10
#include "h264chroma_template.c" #include "h264chroma_template.c"
#undef BIT_DEPTH #undef BIT_DEPTH
@ -41,16 +37,10 @@
void ff_h264chroma_init(H264ChromaContext *c, int bit_depth) void ff_h264chroma_init(H264ChromaContext *c, int bit_depth)
{ {
switch (bit_depth) { if (bit_depth > 8 && bit_depth <= 16) {
case 10: SET_CHROMA(16);
SET_CHROMA(10); } else {
break;
case 9:
SET_CHROMA(9);
break;
default:
SET_CHROMA(8); SET_CHROMA(8);
break;
} }
if (ARCH_ARM) if (ARCH_ARM)

6
libavcodec/x86/h264chroma_init.c
View File

@ -89,14 +89,14 @@ void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth)
c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_mmxext; c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_mmxext;
} }
if (EXTERNAL_MMXEXT(mm_flags) && bit_depth == 10) { if (EXTERNAL_MMXEXT(mm_flags) && bit_depth > 8 && bit_depth <= 10) {
c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_10_mmxext; c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_10_mmxext;
c->avg_h264_chroma_pixels_tab[2] = ff_avg_h264_chroma_mc2_10_mmxext; c->avg_h264_chroma_pixels_tab[2] = ff_avg_h264_chroma_mc2_10_mmxext;
c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_10_mmxext; c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_10_mmxext;
c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_10_mmxext; c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_10_mmxext;
} }
if (EXTERNAL_SSE2(mm_flags) && bit_depth == 10) { if (EXTERNAL_SSE2(mm_flags) && bit_depth > 8 && bit_depth <= 10) {
c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_10_sse2; c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_10_sse2;
c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_10_sse2; c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_10_sse2;
} }
@ -108,7 +108,7 @@ void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth)
c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_ssse3; c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_ssse3;
} }
if (EXTERNAL_AVX(mm_flags) && bit_depth == 10) { if (EXTERNAL_AVX(mm_flags) && bit_depth > 8 && bit_depth <= 10) {
// AVX implies !cache64. // AVX implies !cache64.
// TODO: Port cache(32|64) detection from x264. // TODO: Port cache(32|64) detection from x264.
c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_10_avx; c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_10_avx;