Revision 8dbe5856 libavcodec/h264pred.c
libavcodec/h264pred.c | ||
---|---|---|
26 | 26 |
*/ |
27 | 27 |
|
28 | 28 |
#include "h264pred.h" |
29 |
|
|
30 |
#define BIT_DEPTH 8 |
|
31 |
#include "h264pred_internal.h" |
|
32 |
#undef BIT_DEPTH |
|
33 |
|
|
34 |
#define BIT_DEPTH 9 |
|
35 |
#include "h264pred_internal.h" |
|
36 |
#undef BIT_DEPTH |
|
37 |
|
|
38 |
#define BIT_DEPTH 10 |
|
29 | 39 |
#include "h264pred_internal.h" |
40 |
#undef BIT_DEPTH |
|
30 | 41 |
|
31 | 42 |
/** |
32 | 43 |
* Set the intra prediction function pointers. |
33 | 44 |
*/ |
34 |
void ff_h264_pred_init(H264PredContext *h, int codec_id){ |
|
45 |
void ff_h264_pred_init(H264PredContext *h, int codec_id, const int bit_depth){
|
|
35 | 46 |
// MpegEncContext * const s = &h->s; |
36 | 47 |
|
37 |
if(codec_id != CODEC_ID_RV40){ |
|
38 |
if(codec_id == CODEC_ID_VP8) { |
|
39 |
h->pred4x4[VERT_PRED ]= pred4x4_vertical_vp8_c; |
|
40 |
h->pred4x4[HOR_PRED ]= pred4x4_horizontal_vp8_c; |
|
41 |
} else { |
|
42 |
h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; |
|
43 |
h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; |
|
44 |
} |
|
45 |
h->pred4x4[DC_PRED ]= pred4x4_dc_c; |
|
46 |
if(codec_id == CODEC_ID_SVQ3) |
|
47 |
h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_svq3_c; |
|
48 |
else |
|
49 |
h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c; |
|
50 |
h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c; |
|
51 |
h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c; |
|
52 |
h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c; |
|
53 |
if (codec_id == CODEC_ID_VP8) { |
|
54 |
h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_vp8_c; |
|
55 |
} else |
|
56 |
h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c; |
|
57 |
h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c; |
|
58 |
if(codec_id != CODEC_ID_VP8) { |
|
59 |
h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c; |
|
60 |
h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c; |
|
61 |
h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; |
|
62 |
} else { |
|
63 |
h->pred4x4[TM_VP8_PRED ]= pred4x4_tm_vp8_c; |
|
64 |
h->pred4x4[DC_127_PRED ]= pred4x4_127_dc_c; |
|
65 |
h->pred4x4[DC_129_PRED ]= pred4x4_129_dc_c; |
|
66 |
h->pred4x4[VERT_VP8_PRED ]= pred4x4_vertical_c; |
|
67 |
h->pred4x4[HOR_VP8_PRED ]= pred4x4_horizontal_c; |
|
68 |
} |
|
69 |
}else{ |
|
70 |
h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; |
|
71 |
h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; |
|
72 |
h->pred4x4[DC_PRED ]= pred4x4_dc_c; |
|
73 |
h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_rv40_c; |
|
74 |
h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c; |
|
75 |
h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c; |
|
76 |
h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c; |
|
77 |
h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_rv40_c; |
|
78 |
h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_rv40_c; |
|
79 |
h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c; |
|
80 |
h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c; |
|
81 |
h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; |
|
82 |
h->pred4x4[DIAG_DOWN_LEFT_PRED_RV40_NODOWN]= pred4x4_down_left_rv40_nodown_c; |
|
83 |
h->pred4x4[HOR_UP_PRED_RV40_NODOWN]= pred4x4_horizontal_up_rv40_nodown_c; |
|
84 |
h->pred4x4[VERT_LEFT_PRED_RV40_NODOWN]= pred4x4_vertical_left_rv40_nodown_c; |
|
85 |
} |
|
86 |
|
|
87 |
h->pred8x8l[VERT_PRED ]= pred8x8l_vertical_c; |
|
88 |
h->pred8x8l[HOR_PRED ]= pred8x8l_horizontal_c; |
|
89 |
h->pred8x8l[DC_PRED ]= pred8x8l_dc_c; |
|
90 |
h->pred8x8l[DIAG_DOWN_LEFT_PRED ]= pred8x8l_down_left_c; |
|
91 |
h->pred8x8l[DIAG_DOWN_RIGHT_PRED]= pred8x8l_down_right_c; |
|
92 |
h->pred8x8l[VERT_RIGHT_PRED ]= pred8x8l_vertical_right_c; |
|
93 |
h->pred8x8l[HOR_DOWN_PRED ]= pred8x8l_horizontal_down_c; |
|
94 |
h->pred8x8l[VERT_LEFT_PRED ]= pred8x8l_vertical_left_c; |
|
95 |
h->pred8x8l[HOR_UP_PRED ]= pred8x8l_horizontal_up_c; |
|
96 |
h->pred8x8l[LEFT_DC_PRED ]= pred8x8l_left_dc_c; |
|
97 |
h->pred8x8l[TOP_DC_PRED ]= pred8x8l_top_dc_c; |
|
98 |
h->pred8x8l[DC_128_PRED ]= pred8x8l_128_dc_c; |
|
48 |
#undef FUNC |
|
49 |
#undef FUNCC |
|
50 |
#define FUNC(a, depth) a ## _ ## depth |
|
51 |
#define FUNCC(a, depth) a ## _ ## depth ## _c |
|
99 | 52 |
|
100 |
h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c; |
|
101 |
h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c; |
|
102 |
if (codec_id != CODEC_ID_VP8) { |
|
103 |
h->pred8x8[PLANE_PRED8x8]= pred8x8_plane_c; |
|
104 |
} else |
|
105 |
h->pred8x8[PLANE_PRED8x8]= pred8x8_tm_vp8_c; |
|
106 |
if(codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8){ |
|
107 |
h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c; |
|
108 |
h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c; |
|
109 |
h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c; |
|
110 |
h->pred8x8[ALZHEIMER_DC_L0T_PRED8x8 ]= pred8x8_mad_cow_dc_l0t; |
|
111 |
h->pred8x8[ALZHEIMER_DC_0LT_PRED8x8 ]= pred8x8_mad_cow_dc_0lt; |
|
112 |
h->pred8x8[ALZHEIMER_DC_L00_PRED8x8 ]= pred8x8_mad_cow_dc_l00; |
|
113 |
h->pred8x8[ALZHEIMER_DC_0L0_PRED8x8 ]= pred8x8_mad_cow_dc_0l0; |
|
114 |
}else{ |
|
115 |
h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_rv40_c; |
|
116 |
h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_rv40_c; |
|
117 |
h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_rv40_c; |
|
118 |
if (codec_id == CODEC_ID_VP8) { |
|
119 |
h->pred8x8[DC_127_PRED8x8]= pred8x8_127_dc_c; |
|
120 |
h->pred8x8[DC_129_PRED8x8]= pred8x8_129_dc_c; |
|
121 |
} |
|
122 |
} |
|
123 |
h->pred8x8[DC_128_PRED8x8 ]= pred8x8_128_dc_c; |
|
53 |
#define H264_PRED(depth) \ |
|
54 |
if(codec_id != CODEC_ID_RV40){\ |
|
55 |
if(codec_id == CODEC_ID_VP8) {\ |
|
56 |
h->pred4x4[VERT_PRED ]= FUNCC(pred4x4_vertical_vp8 , depth);\ |
|
57 |
h->pred4x4[HOR_PRED ]= FUNCC(pred4x4_horizontal_vp8 , depth);\ |
|
58 |
} else {\ |
|
59 |
h->pred4x4[VERT_PRED ]= FUNCC(pred4x4_vertical , depth);\ |
|
60 |
h->pred4x4[HOR_PRED ]= FUNCC(pred4x4_horizontal , depth);\ |
|
61 |
}\ |
|
62 |
h->pred4x4[DC_PRED ]= FUNCC(pred4x4_dc , depth);\ |
|
63 |
if(codec_id == CODEC_ID_SVQ3)\ |
|
64 |
h->pred4x4[DIAG_DOWN_LEFT_PRED ]= FUNCC(pred4x4_down_left_svq3, depth);\ |
|
65 |
else\ |
|
66 |
h->pred4x4[DIAG_DOWN_LEFT_PRED ]= FUNCC(pred4x4_down_left , depth);\ |
|
67 |
h->pred4x4[DIAG_DOWN_RIGHT_PRED]= FUNCC(pred4x4_down_right , depth);\ |
|
68 |
h->pred4x4[VERT_RIGHT_PRED ]= FUNCC(pred4x4_vertical_right , depth);\ |
|
69 |
h->pred4x4[HOR_DOWN_PRED ]= FUNCC(pred4x4_horizontal_down , depth);\ |
|
70 |
if (codec_id == CODEC_ID_VP8) {\ |
|
71 |
h->pred4x4[VERT_LEFT_PRED ]= FUNCC(pred4x4_vertical_left_vp8 , depth);\ |
|
72 |
} else\ |
|
73 |
h->pred4x4[VERT_LEFT_PRED ]= FUNCC(pred4x4_vertical_left , depth);\ |
|
74 |
h->pred4x4[HOR_UP_PRED ]= FUNCC(pred4x4_horizontal_up , depth);\ |
|
75 |
if(codec_id != CODEC_ID_VP8) {\ |
|
76 |
h->pred4x4[LEFT_DC_PRED ]= FUNCC(pred4x4_left_dc , depth);\ |
|
77 |
h->pred4x4[TOP_DC_PRED ]= FUNCC(pred4x4_top_dc , depth);\ |
|
78 |
h->pred4x4[DC_128_PRED ]= FUNCC(pred4x4_128_dc , depth);\ |
|
79 |
} else {\ |
|
80 |
h->pred4x4[TM_VP8_PRED ]= FUNCC(pred4x4_tm_vp8 , depth);\ |
|
81 |
h->pred4x4[DC_127_PRED ]= FUNCC(pred4x4_127_dc , depth);\ |
|
82 |
h->pred4x4[DC_129_PRED ]= FUNCC(pred4x4_129_dc , depth);\ |
|
83 |
h->pred4x4[VERT_VP8_PRED ]= FUNCC(pred4x4_vertical , depth);\ |
|
84 |
h->pred4x4[HOR_VP8_PRED ]= FUNCC(pred4x4_horizontal , depth);\ |
|
85 |
}\ |
|
86 |
}else{\ |
|
87 |
h->pred4x4[VERT_PRED ]= FUNCC(pred4x4_vertical , depth);\ |
|
88 |
h->pred4x4[HOR_PRED ]= FUNCC(pred4x4_horizontal , depth);\ |
|
89 |
h->pred4x4[DC_PRED ]= FUNCC(pred4x4_dc , depth);\ |
|
90 |
h->pred4x4[DIAG_DOWN_LEFT_PRED ]= FUNCC(pred4x4_down_left_rv40 , depth);\ |
|
91 |
h->pred4x4[DIAG_DOWN_RIGHT_PRED]= FUNCC(pred4x4_down_right , depth);\ |
|
92 |
h->pred4x4[VERT_RIGHT_PRED ]= FUNCC(pred4x4_vertical_right , depth);\ |
|
93 |
h->pred4x4[HOR_DOWN_PRED ]= FUNCC(pred4x4_horizontal_down , depth);\ |
|
94 |
h->pred4x4[VERT_LEFT_PRED ]= FUNCC(pred4x4_vertical_left_rv40, depth);\ |
|
95 |
h->pred4x4[HOR_UP_PRED ]= FUNCC(pred4x4_horizontal_up_rv40, depth);\ |
|
96 |
h->pred4x4[LEFT_DC_PRED ]= FUNCC(pred4x4_left_dc , depth);\ |
|
97 |
h->pred4x4[TOP_DC_PRED ]= FUNCC(pred4x4_top_dc , depth);\ |
|
98 |
h->pred4x4[DC_128_PRED ]= FUNCC(pred4x4_128_dc , depth);\ |
|
99 |
h->pred4x4[DIAG_DOWN_LEFT_PRED_RV40_NODOWN]= FUNCC(pred4x4_down_left_rv40_nodown, depth);\ |
|
100 |
h->pred4x4[HOR_UP_PRED_RV40_NODOWN]= FUNCC(pred4x4_horizontal_up_rv40_nodown , depth);\ |
|
101 |
h->pred4x4[VERT_LEFT_PRED_RV40_NODOWN]= FUNCC(pred4x4_vertical_left_rv40_nodown , depth);\ |
|
102 |
}\ |
|
103 |
\ |
|
104 |
h->pred8x8l[VERT_PRED ]= FUNCC(pred8x8l_vertical , depth);\ |
|
105 |
h->pred8x8l[HOR_PRED ]= FUNCC(pred8x8l_horizontal , depth);\ |
|
106 |
h->pred8x8l[DC_PRED ]= FUNCC(pred8x8l_dc , depth);\ |
|
107 |
h->pred8x8l[DIAG_DOWN_LEFT_PRED ]= FUNCC(pred8x8l_down_left , depth);\ |
|
108 |
h->pred8x8l[DIAG_DOWN_RIGHT_PRED]= FUNCC(pred8x8l_down_right , depth);\ |
|
109 |
h->pred8x8l[VERT_RIGHT_PRED ]= FUNCC(pred8x8l_vertical_right , depth);\ |
|
110 |
h->pred8x8l[HOR_DOWN_PRED ]= FUNCC(pred8x8l_horizontal_down , depth);\ |
|
111 |
h->pred8x8l[VERT_LEFT_PRED ]= FUNCC(pred8x8l_vertical_left , depth);\ |
|
112 |
h->pred8x8l[HOR_UP_PRED ]= FUNCC(pred8x8l_horizontal_up , depth);\ |
|
113 |
h->pred8x8l[LEFT_DC_PRED ]= FUNCC(pred8x8l_left_dc , depth);\ |
|
114 |
h->pred8x8l[TOP_DC_PRED ]= FUNCC(pred8x8l_top_dc , depth);\ |
|
115 |
h->pred8x8l[DC_128_PRED ]= FUNCC(pred8x8l_128_dc , depth);\ |
|
116 |
\ |
|
117 |
h->pred8x8[VERT_PRED8x8 ]= FUNCC(pred8x8_vertical , depth);\ |
|
118 |
h->pred8x8[HOR_PRED8x8 ]= FUNCC(pred8x8_horizontal , depth);\ |
|
119 |
if (codec_id != CODEC_ID_VP8) {\ |
|
120 |
h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x8_plane , depth);\ |
|
121 |
} else\ |
|
122 |
h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x8_tm_vp8 , depth);\ |
|
123 |
if(codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8){\ |
|
124 |
h->pred8x8[DC_PRED8x8 ]= FUNCC(pred8x8_dc , depth);\ |
|
125 |
h->pred8x8[LEFT_DC_PRED8x8]= FUNCC(pred8x8_left_dc , depth);\ |
|
126 |
h->pred8x8[TOP_DC_PRED8x8 ]= FUNCC(pred8x8_top_dc , depth);\ |
|
127 |
h->pred8x8[ALZHEIMER_DC_L0T_PRED8x8 ]= FUNC(pred8x8_mad_cow_dc_l0t, depth);\ |
|
128 |
h->pred8x8[ALZHEIMER_DC_0LT_PRED8x8 ]= FUNC(pred8x8_mad_cow_dc_0lt, depth);\ |
|
129 |
h->pred8x8[ALZHEIMER_DC_L00_PRED8x8 ]= FUNC(pred8x8_mad_cow_dc_l00, depth);\ |
|
130 |
h->pred8x8[ALZHEIMER_DC_0L0_PRED8x8 ]= FUNC(pred8x8_mad_cow_dc_0l0, depth);\ |
|
131 |
}else{\ |
|
132 |
h->pred8x8[DC_PRED8x8 ]= FUNCC(pred8x8_dc_rv40 , depth);\ |
|
133 |
h->pred8x8[LEFT_DC_PRED8x8]= FUNCC(pred8x8_left_dc_rv40 , depth);\ |
|
134 |
h->pred8x8[TOP_DC_PRED8x8 ]= FUNCC(pred8x8_top_dc_rv40 , depth);\ |
|
135 |
if (codec_id == CODEC_ID_VP8) {\ |
|
136 |
h->pred8x8[DC_127_PRED8x8]= FUNCC(pred8x8_127_dc , depth);\ |
|
137 |
h->pred8x8[DC_129_PRED8x8]= FUNCC(pred8x8_129_dc , depth);\ |
|
138 |
}\ |
|
139 |
}\ |
|
140 |
h->pred8x8[DC_128_PRED8x8 ]= FUNCC(pred8x8_128_dc , depth);\ |
|
141 |
\ |
|
142 |
h->pred16x16[DC_PRED8x8 ]= FUNCC(pred16x16_dc , depth);\ |
|
143 |
h->pred16x16[VERT_PRED8x8 ]= FUNCC(pred16x16_vertical , depth);\ |
|
144 |
h->pred16x16[HOR_PRED8x8 ]= FUNCC(pred16x16_horizontal , depth);\ |
|
145 |
switch(codec_id){\ |
|
146 |
case CODEC_ID_SVQ3:\ |
|
147 |
h->pred16x16[PLANE_PRED8x8 ]= FUNCC(pred16x16_plane_svq3 , depth);\ |
|
148 |
break;\ |
|
149 |
case CODEC_ID_RV40:\ |
|
150 |
h->pred16x16[PLANE_PRED8x8 ]= FUNCC(pred16x16_plane_rv40 , depth);\ |
|
151 |
break;\ |
|
152 |
case CODEC_ID_VP8:\ |
|
153 |
h->pred16x16[PLANE_PRED8x8 ]= FUNCC(pred16x16_tm_vp8 , depth);\ |
|
154 |
h->pred16x16[DC_127_PRED8x8]= FUNCC(pred16x16_127_dc , depth);\ |
|
155 |
h->pred16x16[DC_129_PRED8x8]= FUNCC(pred16x16_129_dc , depth);\ |
|
156 |
break;\ |
|
157 |
default:\ |
|
158 |
h->pred16x16[PLANE_PRED8x8 ]= FUNCC(pred16x16_plane , depth);\ |
|
159 |
break;\ |
|
160 |
}\ |
|
161 |
h->pred16x16[LEFT_DC_PRED8x8]= FUNCC(pred16x16_left_dc , depth);\ |
|
162 |
h->pred16x16[TOP_DC_PRED8x8 ]= FUNCC(pred16x16_top_dc , depth);\ |
|
163 |
h->pred16x16[DC_128_PRED8x8 ]= FUNCC(pred16x16_128_dc , depth);\ |
|
164 |
\ |
|
165 |
/* special lossless h/v prediction for h264 */ \ |
|
166 |
h->pred4x4_add [VERT_PRED ]= FUNCC(pred4x4_vertical_add , depth);\ |
|
167 |
h->pred4x4_add [ HOR_PRED ]= FUNCC(pred4x4_horizontal_add , depth);\ |
|
168 |
h->pred8x8l_add [VERT_PRED ]= FUNCC(pred8x8l_vertical_add , depth);\ |
|
169 |
h->pred8x8l_add [ HOR_PRED ]= FUNCC(pred8x8l_horizontal_add , depth);\ |
|
170 |
h->pred8x8_add [VERT_PRED8x8]= FUNCC(pred8x8_vertical_add , depth);\ |
|
171 |
h->pred8x8_add [ HOR_PRED8x8]= FUNCC(pred8x8_horizontal_add , depth);\ |
|
172 |
h->pred16x16_add[VERT_PRED8x8]= FUNCC(pred16x16_vertical_add , depth);\ |
|
173 |
h->pred16x16_add[ HOR_PRED8x8]= FUNCC(pred16x16_horizontal_add , depth);\ |
|
124 | 174 |
|
125 |
h->pred16x16[DC_PRED8x8 ]= pred16x16_dc_c; |
|
126 |
h->pred16x16[VERT_PRED8x8 ]= pred16x16_vertical_c; |
|
127 |
h->pred16x16[HOR_PRED8x8 ]= pred16x16_horizontal_c; |
|
128 |
switch(codec_id){ |
|
129 |
case CODEC_ID_SVQ3: |
|
130 |
h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_svq3_c; |
|
131 |
break; |
|
132 |
case CODEC_ID_RV40: |
|
133 |
h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_rv40_c; |
|
134 |
break; |
|
135 |
case CODEC_ID_VP8: |
|
136 |
h->pred16x16[PLANE_PRED8x8 ]= pred16x16_tm_vp8_c; |
|
137 |
h->pred16x16[DC_127_PRED8x8]= pred16x16_127_dc_c; |
|
138 |
h->pred16x16[DC_129_PRED8x8]= pred16x16_129_dc_c; |
|
139 |
break; |
|
140 |
default: |
|
141 |
h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c; |
|
142 |
break; |
|
175 |
switch (bit_depth) { |
|
176 |
case 9: |
|
177 |
H264_PRED(9) |
|
178 |
break; |
|
179 |
case 10: |
|
180 |
H264_PRED(10) |
|
181 |
break; |
|
182 |
default: |
|
183 |
H264_PRED(8) |
|
184 |
break; |
|
143 | 185 |
} |
144 |
h->pred16x16[LEFT_DC_PRED8x8]= pred16x16_left_dc_c; |
|
145 |
h->pred16x16[TOP_DC_PRED8x8 ]= pred16x16_top_dc_c; |
|
146 |
h->pred16x16[DC_128_PRED8x8 ]= pred16x16_128_dc_c; |
|
147 |
|
|
148 |
//special lossless h/v prediction for h264 |
|
149 |
h->pred4x4_add [VERT_PRED ]= pred4x4_vertical_add_c; |
|
150 |
h->pred4x4_add [ HOR_PRED ]= pred4x4_horizontal_add_c; |
|
151 |
h->pred8x8l_add [VERT_PRED ]= pred8x8l_vertical_add_c; |
|
152 |
h->pred8x8l_add [ HOR_PRED ]= pred8x8l_horizontal_add_c; |
|
153 |
h->pred8x8_add [VERT_PRED8x8]= pred8x8_vertical_add_c; |
|
154 |
h->pred8x8_add [ HOR_PRED8x8]= pred8x8_horizontal_add_c; |
|
155 |
h->pred16x16_add[VERT_PRED8x8]= pred16x16_vertical_add_c; |
|
156 |
h->pred16x16_add[ HOR_PRED8x8]= pred16x16_horizontal_add_c; |
|
157 | 186 |
|
158 |
if (ARCH_ARM) ff_h264_pred_init_arm(h, codec_id); |
|
159 |
if (HAVE_MMX) ff_h264_pred_init_x86(h, codec_id); |
|
187 |
if (ARCH_ARM) ff_h264_pred_init_arm(h, codec_id, bit_depth);
|
|
188 |
if (HAVE_MMX) ff_h264_pred_init_x86(h, codec_id, bit_depth);
|
|
160 | 189 |
} |
Also available in: Unified diff