summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264dsp.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2011-10-21 00:00:39 -0700
committerRonald S. Bultje <rsbultje@gmail.com>2011-10-21 01:00:45 -0700
commitc2d337429c7c87ee559efe54dbc0f84f2a25c3a4 (patch)
tree2aae10d3e5c36d3c3c45b9a8970999cc5c1429f6 /libavcodec/h264dsp.c
parent229d263cc914b5396847f7249fdda2e6ded9ec1b (diff)
downloadffmpeg-streaming-c2d337429c7c87ee559efe54dbc0f84f2a25c3a4.zip
ffmpeg-streaming-c2d337429c7c87ee559efe54dbc0f84f2a25c3a4.tar.gz
H264: change weight/biweight functions to take a height argument.
Neon parts by Mans Rullgard <mans@mansr.com>.
Diffstat (limited to 'libavcodec/h264dsp.c')
-rw-r--r--libavcodec/h264dsp.c28
1 files changed, 8 insertions, 20 deletions
diff --git a/libavcodec/h264dsp.c b/libavcodec/h264dsp.c
index 19ad2db..ba96707 100644
--- a/libavcodec/h264dsp.c
+++ b/libavcodec/h264dsp.c
@@ -64,26 +64,14 @@ void ff_h264dsp_init(H264DSPContext *c, const int bit_depth, const int chroma_fo
else\
c->h264_chroma_dc_dequant_idct= FUNC(ff_h264_chroma422_dc_dequant_idct, depth);\
\
- c->weight_h264_pixels_tab[0]= FUNC(weight_h264_pixels16x16, depth);\
- c->weight_h264_pixels_tab[1]= FUNC(weight_h264_pixels16x8, depth);\
- c->weight_h264_pixels_tab[2]= FUNC(weight_h264_pixels8x16, depth);\
- c->weight_h264_pixels_tab[3]= FUNC(weight_h264_pixels8x8, depth);\
- c->weight_h264_pixels_tab[4]= FUNC(weight_h264_pixels8x4, depth);\
- c->weight_h264_pixels_tab[5]= FUNC(weight_h264_pixels4x8, depth);\
- c->weight_h264_pixels_tab[6]= FUNC(weight_h264_pixels4x4, depth);\
- c->weight_h264_pixels_tab[7]= FUNC(weight_h264_pixels4x2, depth);\
- c->weight_h264_pixels_tab[8]= FUNC(weight_h264_pixels2x4, depth);\
- c->weight_h264_pixels_tab[9]= FUNC(weight_h264_pixels2x2, depth);\
- c->biweight_h264_pixels_tab[0]= FUNC(biweight_h264_pixels16x16, depth);\
- c->biweight_h264_pixels_tab[1]= FUNC(biweight_h264_pixels16x8, depth);\
- c->biweight_h264_pixels_tab[2]= FUNC(biweight_h264_pixels8x16, depth);\
- c->biweight_h264_pixels_tab[3]= FUNC(biweight_h264_pixels8x8, depth);\
- c->biweight_h264_pixels_tab[4]= FUNC(biweight_h264_pixels8x4, depth);\
- c->biweight_h264_pixels_tab[5]= FUNC(biweight_h264_pixels4x8, depth);\
- c->biweight_h264_pixels_tab[6]= FUNC(biweight_h264_pixels4x4, depth);\
- c->biweight_h264_pixels_tab[7]= FUNC(biweight_h264_pixels4x2, depth);\
- c->biweight_h264_pixels_tab[8]= FUNC(biweight_h264_pixels2x4, depth);\
- c->biweight_h264_pixels_tab[9]= FUNC(biweight_h264_pixels2x2, depth);\
+ c->weight_h264_pixels_tab[0]= FUNC(weight_h264_pixels16, depth);\
+ c->weight_h264_pixels_tab[1]= FUNC(weight_h264_pixels8, depth);\
+ c->weight_h264_pixels_tab[2]= FUNC(weight_h264_pixels4, depth);\
+ c->weight_h264_pixels_tab[3]= FUNC(weight_h264_pixels2, depth);\
+ c->biweight_h264_pixels_tab[0]= FUNC(biweight_h264_pixels16, depth);\
+ c->biweight_h264_pixels_tab[1]= FUNC(biweight_h264_pixels8, depth);\
+ c->biweight_h264_pixels_tab[2]= FUNC(biweight_h264_pixels4, depth);\
+ c->biweight_h264_pixels_tab[3]= FUNC(biweight_h264_pixels2, depth);\
\
c->h264_v_loop_filter_luma= FUNC(h264_v_loop_filter_luma, depth);\
c->h264_h_loop_filter_luma= FUNC(h264_h_loop_filter_luma, depth);\
OpenPOWER on IntegriCloud