Mercurial > libavcodec.hg
annotate h264.c @ 2255:507690ff49a2 libavcodec
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
author | michael |
---|---|
date | Sat, 25 Sep 2004 10:06:31 +0000 |
parents | 0dfe4e32b19c |
children | cd43603c46f9 |
rev | line source |
---|---|
1168 | 1 /* |
2 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder | |
3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> | |
4 * | |
5 * This library is free software; you can redistribute it and/or | |
6 * modify it under the terms of the GNU Lesser General Public | |
7 * License as published by the Free Software Foundation; either | |
8 * version 2 of the License, or (at your option) any later version. | |
9 * | |
10 * This library is distributed in the hope that it will be useful, | |
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 * Lesser General Public License for more details. | |
14 * | |
15 * You should have received a copy of the GNU Lesser General Public | |
16 * License along with this library; if not, write to the Free Software | |
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
18 * | |
19 */ | |
20 | |
21 /** | |
22 * @file h264.c | |
23 * H.264 / AVC / MPEG4 part10 codec. | |
24 * @author Michael Niedermayer <michaelni@gmx.at> | |
25 */ | |
26 | |
27 #include "common.h" | |
28 #include "dsputil.h" | |
29 #include "avcodec.h" | |
30 #include "mpegvideo.h" | |
31 #include "h264data.h" | |
32 #include "golomb.h" | |
33 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
34 #include "cabac.h" |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
35 |
1168 | 36 #undef NDEBUG |
37 #include <assert.h> | |
38 | |
39 #define interlaced_dct interlaced_dct_is_a_bad_name | |
40 #define mb_intra mb_intra_isnt_initalized_see_mb_type | |
41 | |
42 #define LUMA_DC_BLOCK_INDEX 25 | |
43 #define CHROMA_DC_BLOCK_INDEX 26 | |
44 | |
45 #define CHROMA_DC_COEFF_TOKEN_VLC_BITS 8 | |
46 #define COEFF_TOKEN_VLC_BITS 8 | |
47 #define TOTAL_ZEROS_VLC_BITS 9 | |
48 #define CHROMA_DC_TOTAL_ZEROS_VLC_BITS 3 | |
49 #define RUN_VLC_BITS 3 | |
50 #define RUN7_VLC_BITS 6 | |
51 | |
52 #define MAX_SPS_COUNT 32 | |
53 #define MAX_PPS_COUNT 256 | |
54 | |
55 #define MAX_MMCO_COUNT 66 | |
56 | |
57 /** | |
58 * Sequence parameter set | |
59 */ | |
60 typedef struct SPS{ | |
61 | |
62 int profile_idc; | |
63 int level_idc; | |
64 int log2_max_frame_num; ///< log2_max_frame_num_minus4 + 4 | |
65 int poc_type; ///< pic_order_cnt_type | |
66 int log2_max_poc_lsb; ///< log2_max_pic_order_cnt_lsb_minus4 | |
67 int delta_pic_order_always_zero_flag; | |
68 int offset_for_non_ref_pic; | |
69 int offset_for_top_to_bottom_field; | |
70 int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle | |
71 int ref_frame_count; ///< num_ref_frames | |
1371 | 72 int gaps_in_frame_num_allowed_flag; |
1168 | 73 int mb_width; ///< frame_width_in_mbs_minus1 + 1 |
74 int mb_height; ///< frame_height_in_mbs_minus1 + 1 | |
75 int frame_mbs_only_flag; | |
76 int mb_aff; ///<mb_adaptive_frame_field_flag | |
77 int direct_8x8_inference_flag; | |
1371 | 78 int crop; ///< frame_cropping_flag |
79 int crop_left; ///< frame_cropping_rect_left_offset | |
80 int crop_right; ///< frame_cropping_rect_right_offset | |
81 int crop_top; ///< frame_cropping_rect_top_offset | |
82 int crop_bottom; ///< frame_cropping_rect_bottom_offset | |
1168 | 83 int vui_parameters_present_flag; |
1548 | 84 AVRational sar; |
2174
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
85 int timing_info_present_flag; |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
86 uint32_t num_units_in_tick; |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
87 uint32_t time_scale; |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
88 int fixed_frame_rate_flag; |
1168 | 89 short offset_for_ref_frame[256]; //FIXME dyn aloc? |
90 }SPS; | |
91 | |
92 /** | |
93 * Picture parameter set | |
94 */ | |
95 typedef struct PPS{ | |
96 int sps_id; | |
97 int cabac; ///< entropy_coding_mode_flag | |
98 int pic_order_present; ///< pic_order_present_flag | |
99 int slice_group_count; ///< num_slice_groups_minus1 + 1 | |
100 int mb_slice_group_map_type; | |
101 int ref_count[2]; ///< num_ref_idx_l0/1_active_minus1 + 1 | |
102 int weighted_pred; ///< weighted_pred_flag | |
103 int weighted_bipred_idc; | |
104 int init_qp; ///< pic_init_qp_minus26 + 26 | |
105 int init_qs; ///< pic_init_qs_minus26 + 26 | |
106 int chroma_qp_index_offset; | |
107 int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag | |
108 int constrained_intra_pred; ///< constrained_intra_pred_flag | |
109 int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag | |
110 }PPS; | |
111 | |
112 /** | |
113 * Memory management control operation opcode. | |
114 */ | |
115 typedef enum MMCOOpcode{ | |
116 MMCO_END=0, | |
117 MMCO_SHORT2UNUSED, | |
118 MMCO_LONG2UNUSED, | |
119 MMCO_SHORT2LONG, | |
120 MMCO_SET_MAX_LONG, | |
121 MMCO_RESET, | |
122 MMCO_LONG, | |
123 } MMCOOpcode; | |
124 | |
125 /** | |
126 * Memory management control operation. | |
127 */ | |
128 typedef struct MMCO{ | |
129 MMCOOpcode opcode; | |
130 int short_frame_num; | |
131 int long_index; | |
132 } MMCO; | |
133 | |
134 /** | |
135 * H264Context | |
136 */ | |
137 typedef struct H264Context{ | |
138 MpegEncContext s; | |
139 int nal_ref_idc; | |
140 int nal_unit_type; | |
141 #define NAL_SLICE 1 | |
142 #define NAL_DPA 2 | |
143 #define NAL_DPB 3 | |
144 #define NAL_DPC 4 | |
145 #define NAL_IDR_SLICE 5 | |
146 #define NAL_SEI 6 | |
147 #define NAL_SPS 7 | |
148 #define NAL_PPS 8 | |
149 #define NAL_PICTURE_DELIMITER 9 | |
150 #define NAL_FILTER_DATA 10 | |
151 uint8_t *rbsp_buffer; | |
152 int rbsp_buffer_size; | |
153 | |
2227 | 154 /** |
155 * Used to parse AVC variant of h264 | |
156 */ | |
157 int is_avc; ///< this flag is != 0 if codec is avc1 | |
158 int got_avcC; ///< flag used to parse avcC data only once | |
159 int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) | |
160 | |
1168 | 161 int chroma_qp; //QPc |
162 | |
163 int prev_mb_skiped; //FIXME remove (IMHO not used) | |
164 | |
165 //prediction stuff | |
166 int chroma_pred_mode; | |
167 int intra16x16_pred_mode; | |
168 | |
169 int8_t intra4x4_pred_mode_cache[5*8]; | |
170 int8_t (*intra4x4_pred_mode)[8]; | |
171 void (*pred4x4 [9+3])(uint8_t *src, uint8_t *topright, int stride);//FIXME move to dsp? | |
172 void (*pred8x8 [4+3])(uint8_t *src, int stride); | |
173 void (*pred16x16[4+3])(uint8_t *src, int stride); | |
174 unsigned int topleft_samples_available; | |
175 unsigned int top_samples_available; | |
176 unsigned int topright_samples_available; | |
177 unsigned int left_samples_available; | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
178 uint8_t (*top_border)[16+2*8]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
179 uint8_t left_border[17+2*9]; |
1168 | 180 |
181 /** | |
182 * non zero coeff count cache. | |
183 * is 64 if not available. | |
184 */ | |
185 uint8_t non_zero_count_cache[6*8]; | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
186 uint8_t (*non_zero_count)[16]; |
1168 | 187 |
188 /** | |
189 * Motion vector cache. | |
190 */ | |
191 int16_t mv_cache[2][5*8][2]; | |
192 int8_t ref_cache[2][5*8]; | |
193 #define LIST_NOT_USED -1 //FIXME rename? | |
194 #define PART_NOT_AVAILABLE -2 | |
195 | |
196 /** | |
197 * is 1 if the specific list MV&references are set to 0,0,-2. | |
198 */ | |
199 int mv_cache_clean[2]; | |
200 | |
201 int block_offset[16+8]; | |
202 int chroma_subblock_offset[16]; //FIXME remove | |
203 | |
204 uint16_t *mb2b_xy; //FIXME are these 4 a good idea? | |
205 uint16_t *mb2b8_xy; | |
206 int b_stride; | |
207 int b8_stride; | |
208 | |
1234 | 209 int halfpel_flag; |
210 int thirdpel_flag; | |
211 | |
1319 | 212 int unknown_svq3_flag; |
213 int next_slice_index; | |
214 | |
1168 | 215 SPS sps_buffer[MAX_SPS_COUNT]; |
216 SPS sps; ///< current sps | |
217 | |
218 PPS pps_buffer[MAX_PPS_COUNT]; | |
219 /** | |
220 * current pps | |
221 */ | |
222 PPS pps; //FIXME move tp Picture perhaps? (->no) do we need that? | |
223 | |
224 int slice_num; | |
225 uint8_t *slice_table_base; | |
226 uint8_t *slice_table; ///< slice_table_base + mb_stride + 1 | |
227 int slice_type; | |
228 int slice_type_fixed; | |
229 | |
230 //interlacing specific flags | |
231 int mb_field_decoding_flag; | |
232 | |
233 int sub_mb_type[4]; | |
234 | |
235 //POC stuff | |
236 int poc_lsb; | |
237 int poc_msb; | |
238 int delta_poc_bottom; | |
239 int delta_poc[2]; | |
240 int frame_num; | |
241 int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0 | |
242 int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0 | |
243 int frame_num_offset; ///< for POC type 2 | |
244 int prev_frame_num_offset; ///< for POC type 2 | |
245 int prev_frame_num; ///< frame_num of the last pic for POC type 1/2 | |
246 | |
247 /** | |
248 * frame_num for frames or 2*frame_num for field pics. | |
249 */ | |
250 int curr_pic_num; | |
251 | |
252 /** | |
253 * max_frame_num or 2*max_frame_num for field pics. | |
254 */ | |
255 int max_pic_num; | |
256 | |
257 //Weighted pred stuff | |
258 int luma_log2_weight_denom; | |
259 int chroma_log2_weight_denom; | |
260 int luma_weight[2][16]; | |
261 int luma_offset[2][16]; | |
262 int chroma_weight[2][16][2]; | |
263 int chroma_offset[2][16][2]; | |
264 | |
265 //deblock | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
266 int deblocking_filter; ///< disable_deblocking_filter_idc with 1<->0 |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
267 int slice_alpha_c0_offset; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
268 int slice_beta_offset; |
1168 | 269 |
270 int redundant_pic_count; | |
271 | |
272 int direct_spatial_mv_pred; | |
273 | |
274 /** | |
275 * num_ref_idx_l0/1_active_minus1 + 1 | |
276 */ | |
277 int ref_count[2];// FIXME split for AFF | |
278 Picture *short_ref[16]; | |
279 Picture *long_ref[16]; | |
280 Picture default_ref_list[2][32]; | |
281 Picture ref_list[2][32]; //FIXME size? | |
282 Picture field_ref_list[2][32]; //FIXME size? | |
283 | |
284 /** | |
285 * memory management control operations buffer. | |
286 */ | |
287 MMCO mmco[MAX_MMCO_COUNT]; | |
288 int mmco_index; | |
289 | |
290 int long_ref_count; ///< number of actual long term references | |
291 int short_ref_count; ///< number of actual short term references | |
292 | |
293 //data partitioning | |
294 GetBitContext intra_gb; | |
295 GetBitContext inter_gb; | |
296 GetBitContext *intra_gb_ptr; | |
297 GetBitContext *inter_gb_ptr; | |
298 | |
299 DCTELEM mb[16*24] __align8; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
300 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
301 /** |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
302 * Cabac |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
303 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
304 CABACContext cabac; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
305 uint8_t cabac_state[399]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
306 int cabac_init_idc; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
307 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
308 /* 0x100 -> non null luma_dc, 0x80/0x40 -> non null chroma_dc (cb/cr), 0x?0 -> chroma_cbp(0,1,2), 0x0? luma_cbp */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
309 uint16_t *cbp_table; |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
310 /* chroma_pred_mode for i4x4 or i16x16, else 0 */ |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
311 uint8_t *chroma_pred_mode_table; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
312 int last_qscale_diff; |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
313 int16_t (*mvd_table[2])[2]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
314 int16_t mvd_cache[2][5*8][2]; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
315 |
1168 | 316 }H264Context; |
317 | |
318 static VLC coeff_token_vlc[4]; | |
319 static VLC chroma_dc_coeff_token_vlc; | |
320 | |
321 static VLC total_zeros_vlc[15]; | |
322 static VLC chroma_dc_total_zeros_vlc[3]; | |
323 | |
324 static VLC run_vlc[6]; | |
325 static VLC run7_vlc; | |
326 | |
1234 | 327 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); |
328 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc); | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
329 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr); |
1234 | 330 |
1269 | 331 static inline uint32_t pack16to32(int a, int b){ |
332 #ifdef WORDS_BIGENDIAN | |
333 return (b&0xFFFF) + (a<<16); | |
334 #else | |
335 return (a&0xFFFF) + (b<<16); | |
336 #endif | |
337 } | |
338 | |
1168 | 339 /** |
340 * fill a rectangle. | |
341 * @param h height of the recatangle, should be a constant | |
342 * @param w width of the recatangle, should be a constant | |
343 * @param size the size of val (1 or 4), should be a constant | |
344 */ | |
1187 | 345 static inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){ //FIXME ensure this IS inlined |
346 uint8_t *p= (uint8_t*)vp; | |
1168 | 347 assert(size==1 || size==4); |
348 | |
349 w *= size; | |
350 stride *= size; | |
351 | |
352 //FIXME check what gcc generates for 64 bit on x86 and possible write a 32 bit ver of it | |
353 if(w==2 && h==2){ | |
354 *(uint16_t*)(p + 0)= | |
355 *(uint16_t*)(p + stride)= size==4 ? val : val*0x0101; | |
356 }else if(w==2 && h==4){ | |
357 *(uint16_t*)(p + 0*stride)= | |
358 *(uint16_t*)(p + 1*stride)= | |
359 *(uint16_t*)(p + 2*stride)= | |
360 *(uint16_t*)(p + 3*stride)= size==4 ? val : val*0x0101; | |
1252 | 361 }else if(w==4 && h==1){ |
362 *(uint32_t*)(p + 0*stride)= size==4 ? val : val*0x01010101; | |
1168 | 363 }else if(w==4 && h==2){ |
364 *(uint32_t*)(p + 0*stride)= | |
365 *(uint32_t*)(p + 1*stride)= size==4 ? val : val*0x01010101; | |
366 }else if(w==4 && h==4){ | |
367 *(uint32_t*)(p + 0*stride)= | |
368 *(uint32_t*)(p + 1*stride)= | |
369 *(uint32_t*)(p + 2*stride)= | |
370 *(uint32_t*)(p + 3*stride)= size==4 ? val : val*0x01010101; | |
371 }else if(w==8 && h==1){ | |
372 *(uint32_t*)(p + 0)= | |
373 *(uint32_t*)(p + 4)= size==4 ? val : val*0x01010101; | |
374 }else if(w==8 && h==2){ | |
375 *(uint32_t*)(p + 0 + 0*stride)= | |
376 *(uint32_t*)(p + 4 + 0*stride)= | |
377 *(uint32_t*)(p + 0 + 1*stride)= | |
378 *(uint32_t*)(p + 4 + 1*stride)= size==4 ? val : val*0x01010101; | |
379 }else if(w==8 && h==4){ | |
380 *(uint64_t*)(p + 0*stride)= | |
381 *(uint64_t*)(p + 1*stride)= | |
382 *(uint64_t*)(p + 2*stride)= | |
383 *(uint64_t*)(p + 3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
384 }else if(w==16 && h==2){ | |
385 *(uint64_t*)(p + 0+0*stride)= | |
386 *(uint64_t*)(p + 8+0*stride)= | |
387 *(uint64_t*)(p + 0+1*stride)= | |
388 *(uint64_t*)(p + 8+1*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
389 }else if(w==16 && h==4){ | |
390 *(uint64_t*)(p + 0+0*stride)= | |
391 *(uint64_t*)(p + 8+0*stride)= | |
392 *(uint64_t*)(p + 0+1*stride)= | |
393 *(uint64_t*)(p + 8+1*stride)= | |
394 *(uint64_t*)(p + 0+2*stride)= | |
395 *(uint64_t*)(p + 8+2*stride)= | |
396 *(uint64_t*)(p + 0+3*stride)= | |
397 *(uint64_t*)(p + 8+3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
398 }else | |
399 assert(0); | |
400 } | |
401 | |
402 static inline void fill_caches(H264Context *h, int mb_type){ | |
403 MpegEncContext * const s = &h->s; | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
404 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 405 int topleft_xy, top_xy, topright_xy, left_xy[2]; |
406 int topleft_type, top_type, topright_type, left_type[2]; | |
407 int left_block[4]; | |
408 int i; | |
409 | |
410 //wow what a mess, why didnt they simplify the interlacing&intra stuff, i cant imagine that these complex rules are worth it | |
411 | |
412 if(h->sps.mb_aff){ | |
413 //FIXME | |
1453 | 414 topleft_xy = 0; /* avoid warning */ |
415 top_xy = 0; /* avoid warning */ | |
416 topright_xy = 0; /* avoid warning */ | |
1168 | 417 }else{ |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
418 topleft_xy = mb_xy-1 - s->mb_stride; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
419 top_xy = mb_xy - s->mb_stride; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
420 topright_xy= mb_xy+1 - s->mb_stride; |
1168 | 421 left_xy[0] = mb_xy-1; |
422 left_xy[1] = mb_xy-1; | |
423 left_block[0]= 0; | |
424 left_block[1]= 1; | |
425 left_block[2]= 2; | |
426 left_block[3]= 3; | |
427 } | |
428 | |
429 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0; | |
430 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0; | |
431 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0; | |
432 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0; | |
433 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0; | |
434 | |
435 if(IS_INTRA(mb_type)){ | |
436 h->topleft_samples_available= | |
437 h->top_samples_available= | |
438 h->left_samples_available= 0xFFFF; | |
439 h->topright_samples_available= 0xEEEA; | |
440 | |
441 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){ | |
442 h->topleft_samples_available= 0xB3FF; | |
443 h->top_samples_available= 0x33FF; | |
444 h->topright_samples_available= 0x26EA; | |
445 } | |
446 for(i=0; i<2; i++){ | |
447 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){ | |
448 h->topleft_samples_available&= 0xDF5F; | |
449 h->left_samples_available&= 0x5F5F; | |
450 } | |
451 } | |
452 | |
453 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred)) | |
454 h->topleft_samples_available&= 0x7FFF; | |
455 | |
456 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred)) | |
457 h->topright_samples_available&= 0xFBFF; | |
458 | |
459 if(IS_INTRA4x4(mb_type)){ | |
460 if(IS_INTRA4x4(top_type)){ | |
461 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4]; | |
462 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5]; | |
463 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6]; | |
464 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3]; | |
465 }else{ | |
466 int pred; | |
467 if(IS_INTRA16x16(top_type) || (IS_INTER(top_type) && !h->pps.constrained_intra_pred)) | |
468 pred= 2; | |
469 else{ | |
470 pred= -1; | |
471 } | |
472 h->intra4x4_pred_mode_cache[4+8*0]= | |
473 h->intra4x4_pred_mode_cache[5+8*0]= | |
474 h->intra4x4_pred_mode_cache[6+8*0]= | |
475 h->intra4x4_pred_mode_cache[7+8*0]= pred; | |
476 } | |
477 for(i=0; i<2; i++){ | |
478 if(IS_INTRA4x4(left_type[i])){ | |
479 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[0+2*i]]; | |
480 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[1+2*i]]; | |
481 }else{ | |
482 int pred; | |
483 if(IS_INTRA16x16(left_type[i]) || (IS_INTER(left_type[i]) && !h->pps.constrained_intra_pred)) | |
484 pred= 2; | |
485 else{ | |
486 pred= -1; | |
487 } | |
488 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= | |
489 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred; | |
490 } | |
491 } | |
492 } | |
493 } | |
494 | |
495 | |
496 /* | |
497 0 . T T. T T T T | |
498 1 L . .L . . . . | |
499 2 L . .L . . . . | |
500 3 . T TL . . . . | |
501 4 L . .L . . . . | |
502 5 L . .. . . . . | |
503 */ | |
504 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec) | |
505 if(top_type){ | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
506 h->non_zero_count_cache[4+8*0]= h->non_zero_count[top_xy][0]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
507 h->non_zero_count_cache[5+8*0]= h->non_zero_count[top_xy][1]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
508 h->non_zero_count_cache[6+8*0]= h->non_zero_count[top_xy][2]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
509 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3]; |
1168 | 510 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
511 h->non_zero_count_cache[1+8*0]= h->non_zero_count[top_xy][7]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
512 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8]; |
1168 | 513 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
514 h->non_zero_count_cache[1+8*3]= h->non_zero_count[top_xy][10]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
515 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11]; |
1168 | 516 }else{ |
517 h->non_zero_count_cache[4+8*0]= | |
518 h->non_zero_count_cache[5+8*0]= | |
519 h->non_zero_count_cache[6+8*0]= | |
520 h->non_zero_count_cache[7+8*0]= | |
521 | |
522 h->non_zero_count_cache[1+8*0]= | |
523 h->non_zero_count_cache[2+8*0]= | |
524 | |
525 h->non_zero_count_cache[1+8*3]= | |
526 h->non_zero_count_cache[2+8*3]= 64; | |
527 } | |
528 | |
529 if(left_type[0]){ | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
530 h->non_zero_count_cache[3+8*1]= h->non_zero_count[left_xy[0]][6]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
531 h->non_zero_count_cache[3+8*2]= h->non_zero_count[left_xy[0]][5]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
532 h->non_zero_count_cache[0+8*1]= h->non_zero_count[left_xy[0]][9]; //FIXME left_block |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
533 h->non_zero_count_cache[0+8*4]= h->non_zero_count[left_xy[0]][12]; |
1168 | 534 }else{ |
535 h->non_zero_count_cache[3+8*1]= | |
536 h->non_zero_count_cache[3+8*2]= | |
537 h->non_zero_count_cache[0+8*1]= | |
538 h->non_zero_count_cache[0+8*4]= 64; | |
539 } | |
540 | |
541 if(left_type[1]){ | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
542 h->non_zero_count_cache[3+8*3]= h->non_zero_count[left_xy[1]][4]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
543 h->non_zero_count_cache[3+8*4]= h->non_zero_count[left_xy[1]][3]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
544 h->non_zero_count_cache[0+8*2]= h->non_zero_count[left_xy[1]][8]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
545 h->non_zero_count_cache[0+8*5]= h->non_zero_count[left_xy[1]][11]; |
1168 | 546 }else{ |
547 h->non_zero_count_cache[3+8*3]= | |
548 h->non_zero_count_cache[3+8*4]= | |
549 h->non_zero_count_cache[0+8*2]= | |
550 h->non_zero_count_cache[0+8*5]= 64; | |
551 } | |
552 | |
553 #if 1 | |
554 if(IS_INTER(mb_type)){ | |
555 int list; | |
556 for(list=0; list<2; list++){ | |
557 if((!IS_8X8(mb_type)) && !USES_LIST(mb_type, list)){ | |
558 /*if(!h->mv_cache_clean[list]){ | |
559 memset(h->mv_cache [list], 0, 8*5*2*sizeof(int16_t)); //FIXME clean only input? clean at all? | |
560 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t)); | |
561 h->mv_cache_clean[list]= 1; | |
562 }*/ | |
563 continue; //FIXME direct mode ... | |
564 } | |
565 h->mv_cache_clean[list]= 0; | |
566 | |
567 if(IS_INTER(topleft_type)){ | |
568 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride; | |
569 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride; | |
570 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; | |
571 h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy]; | |
572 }else{ | |
573 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= 0; | |
574 h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
575 } | |
576 | |
577 if(IS_INTER(top_type)){ | |
578 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; | |
579 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride; | |
580 *(uint32_t*)h->mv_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 0]; | |
581 *(uint32_t*)h->mv_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 1]; | |
582 *(uint32_t*)h->mv_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 2]; | |
583 *(uint32_t*)h->mv_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 3]; | |
584 h->ref_cache[list][scan8[0] + 0 - 1*8]= | |
585 h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][b8_xy + 0]; | |
586 h->ref_cache[list][scan8[0] + 2 - 1*8]= | |
587 h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][b8_xy + 1]; | |
588 }else{ | |
589 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]= | |
590 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]= | |
591 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]= | |
592 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0; | |
593 *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101; | |
594 } | |
595 | |
596 if(IS_INTER(topright_type)){ | |
597 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride; | |
598 const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride; | |
599 *(uint32_t*)h->mv_cache[list][scan8[0] + 4 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; | |
600 h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][b8_xy]; | |
601 }else{ | |
602 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0; | |
603 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
604 } | |
605 | |
606 //FIXME unify cleanup or sth | |
607 if(IS_INTER(left_type[0])){ | |
608 const int b_xy= h->mb2b_xy[left_xy[0]] + 3; | |
609 const int b8_xy= h->mb2b8_xy[left_xy[0]] + 1; | |
610 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 + 0*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[0]]; | |
611 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 + 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[1]]; | |
612 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
613 h->ref_cache[list][scan8[0] - 1 + 1*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0]>>1)]; | |
614 }else{ | |
615 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 0*8]= | |
616 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 1*8]= 0; | |
617 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
618 h->ref_cache[list][scan8[0] - 1 + 1*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
619 } | |
620 | |
621 if(IS_INTER(left_type[1])){ | |
622 const int b_xy= h->mb2b_xy[left_xy[1]] + 3; | |
623 const int b8_xy= h->mb2b8_xy[left_xy[1]] + 1; | |
624 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 + 2*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[2]]; | |
625 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 + 3*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[3]]; | |
626 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
627 h->ref_cache[list][scan8[0] - 1 + 3*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[2]>>1)]; | |
628 }else{ | |
629 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 2*8]= | |
630 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 3*8]= 0; | |
631 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
632 h->ref_cache[list][scan8[0] - 1 + 3*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
633 } | |
634 | |
635 h->ref_cache[list][scan8[5 ]+1] = | |
636 h->ref_cache[list][scan8[7 ]+1] = | |
637 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewher else) | |
638 h->ref_cache[list][scan8[4 ]] = | |
639 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; | |
640 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]= | |
641 *(uint32_t*)h->mv_cache [list][scan8[7 ]+1]= | |
642 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewher else) | |
643 *(uint32_t*)h->mv_cache [list][scan8[4 ]]= | |
644 *(uint32_t*)h->mv_cache [list][scan8[12]]= 0; | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
645 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
646 if( h->pps.cabac ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
647 /* XXX beurk, Load mvd */ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
648 if(IS_INTER(topleft_type)){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
649 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
650 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
651 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
652 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 - 1*8]= 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
653 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
654 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
655 if(IS_INTER(top_type)){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
656 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
657 *(uint32_t*)h->mvd_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 0]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
658 *(uint32_t*)h->mvd_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 1]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
659 *(uint32_t*)h->mvd_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 2]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
660 *(uint32_t*)h->mvd_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 3]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
661 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
662 *(uint32_t*)h->mvd_cache [list][scan8[0] + 0 - 1*8]= |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
663 *(uint32_t*)h->mvd_cache [list][scan8[0] + 1 - 1*8]= |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
664 *(uint32_t*)h->mvd_cache [list][scan8[0] + 2 - 1*8]= |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
665 *(uint32_t*)h->mvd_cache [list][scan8[0] + 3 - 1*8]= 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
666 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
667 if(IS_INTER(left_type[0])){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
668 const int b_xy= h->mb2b_xy[left_xy[0]] + 3; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
669 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 0*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[0]]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
670 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[1]]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
671 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
672 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 0*8]= |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
673 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 1*8]= 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
674 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
675 if(IS_INTER(left_type[1])){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
676 const int b_xy= h->mb2b_xy[left_xy[1]] + 3; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
677 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 2*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[2]]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
678 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 3*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[3]]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
679 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
680 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 2*8]= |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
681 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 3*8]= 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
682 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
683 *(uint32_t*)h->mvd_cache [list][scan8[5 ]+1]= |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
684 *(uint32_t*)h->mvd_cache [list][scan8[7 ]+1]= |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
685 *(uint32_t*)h->mvd_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewher else) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
686 *(uint32_t*)h->mvd_cache [list][scan8[4 ]]= |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
687 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
688 } |
1168 | 689 } |
690 //FIXME | |
691 } | |
692 #endif | |
693 } | |
694 | |
695 static inline void write_back_intra_pred_mode(H264Context *h){ | |
696 MpegEncContext * const s = &h->s; | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
697 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 698 |
699 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1]; | |
700 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2]; | |
701 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3]; | |
702 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4]; | |
703 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4]; | |
704 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4]; | |
705 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4]; | |
706 } | |
707 | |
708 /** | |
709 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
710 */ | |
711 static inline int check_intra4x4_pred_mode(H264Context *h){ | |
712 MpegEncContext * const s = &h->s; | |
713 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0}; | |
714 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED}; | |
715 int i; | |
716 | |
717 if(!(h->top_samples_available&0x8000)){ | |
718 for(i=0; i<4; i++){ | |
719 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ]; | |
720 if(status<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
721 av_log(h->s.avctx, AV_LOG_ERROR, "top block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y); |
1168 | 722 return -1; |
723 } else if(status){ | |
724 h->intra4x4_pred_mode_cache[scan8[0] + i]= status; | |
725 } | |
726 } | |
727 } | |
728 | |
729 if(!(h->left_samples_available&0x8000)){ | |
730 for(i=0; i<4; i++){ | |
731 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ]; | |
732 if(status<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
733 av_log(h->s.avctx, AV_LOG_ERROR, "left block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y); |
1168 | 734 return -1; |
735 } else if(status){ | |
736 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status; | |
737 } | |
738 } | |
739 } | |
740 | |
741 return 0; | |
742 } //FIXME cleanup like next | |
743 | |
744 /** | |
745 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
746 */ | |
747 static inline int check_intra_pred_mode(H264Context *h, int mode){ | |
748 MpegEncContext * const s = &h->s; | |
749 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1}; | |
750 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8}; | |
751 | |
2163 | 752 if(mode < 0 || mode > 6) |
753 return -1; | |
754 | |
1168 | 755 if(!(h->top_samples_available&0x8000)){ |
756 mode= top[ mode ]; | |
757 if(mode<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
758 av_log(h->s.avctx, AV_LOG_ERROR, "top block unavailable for requested intra mode at %d %d\n", s->mb_x, s->mb_y); |
1168 | 759 return -1; |
760 } | |
761 } | |
762 | |
763 if(!(h->left_samples_available&0x8000)){ | |
764 mode= left[ mode ]; | |
765 if(mode<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
766 av_log(h->s.avctx, AV_LOG_ERROR, "left block unavailable for requested intra mode at %d %d\n", s->mb_x, s->mb_y); |
1168 | 767 return -1; |
768 } | |
769 } | |
770 | |
771 return mode; | |
772 } | |
773 | |
774 /** | |
775 * gets the predicted intra4x4 prediction mode. | |
776 */ | |
777 static inline int pred_intra_mode(H264Context *h, int n){ | |
778 const int index8= scan8[n]; | |
779 const int left= h->intra4x4_pred_mode_cache[index8 - 1]; | |
780 const int top = h->intra4x4_pred_mode_cache[index8 - 8]; | |
781 const int min= FFMIN(left, top); | |
782 | |
1170 | 783 tprintf("mode:%d %d min:%d\n", left ,top, min); |
1168 | 784 |
785 if(min<0) return DC_PRED; | |
786 else return min; | |
787 } | |
788 | |
789 static inline void write_back_non_zero_count(H264Context *h){ | |
790 MpegEncContext * const s = &h->s; | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
791 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
792 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
793 h->non_zero_count[mb_xy][0]= h->non_zero_count_cache[4+8*4]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
794 h->non_zero_count[mb_xy][1]= h->non_zero_count_cache[5+8*4]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
795 h->non_zero_count[mb_xy][2]= h->non_zero_count_cache[6+8*4]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
796 h->non_zero_count[mb_xy][3]= h->non_zero_count_cache[7+8*4]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
797 h->non_zero_count[mb_xy][4]= h->non_zero_count_cache[7+8*3]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
798 h->non_zero_count[mb_xy][5]= h->non_zero_count_cache[7+8*2]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
799 h->non_zero_count[mb_xy][6]= h->non_zero_count_cache[7+8*1]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
800 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
801 h->non_zero_count[mb_xy][7]= h->non_zero_count_cache[1+8*2]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
802 h->non_zero_count[mb_xy][8]= h->non_zero_count_cache[2+8*2]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
803 h->non_zero_count[mb_xy][9]= h->non_zero_count_cache[2+8*1]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
804 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
805 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[1+8*5]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
806 h->non_zero_count[mb_xy][11]=h->non_zero_count_cache[2+8*5]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
807 h->non_zero_count[mb_xy][12]=h->non_zero_count_cache[2+8*4]; |
1168 | 808 } |
809 | |
810 /** | |
811 * gets the predicted number of non zero coefficients. | |
812 * @param n block index | |
813 */ | |
814 static inline int pred_non_zero_count(H264Context *h, int n){ | |
815 const int index8= scan8[n]; | |
816 const int left= h->non_zero_count_cache[index8 - 1]; | |
817 const int top = h->non_zero_count_cache[index8 - 8]; | |
818 int i= left + top; | |
819 | |
820 if(i<64) i= (i+1)>>1; | |
821 | |
1170 | 822 tprintf("pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31); |
1168 | 823 |
824 return i&31; | |
825 } | |
826 | |
1169 | 827 static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width){ |
828 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ]; | |
829 | |
830 if(topright_ref != PART_NOT_AVAILABLE){ | |
831 *C= h->mv_cache[list][ i - 8 + part_width ]; | |
832 return topright_ref; | |
833 }else{ | |
1170 | 834 tprintf("topright MV not available\n"); |
835 | |
1169 | 836 *C= h->mv_cache[list][ i - 8 - 1 ]; |
837 return h->ref_cache[list][ i - 8 - 1 ]; | |
838 } | |
839 } | |
840 | |
1168 | 841 /** |
842 * gets the predicted MV. | |
843 * @param n the block index | |
844 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4) | |
845 * @param mx the x component of the predicted motion vector | |
846 * @param my the y component of the predicted motion vector | |
847 */ | |
848 static inline void pred_motion(H264Context * const h, int n, int part_width, int list, int ref, int * const mx, int * const my){ | |
849 const int index8= scan8[n]; | |
850 const int top_ref= h->ref_cache[list][ index8 - 8 ]; | |
851 const int left_ref= h->ref_cache[list][ index8 - 1 ]; | |
852 const int16_t * const A= h->mv_cache[list][ index8 - 1 ]; | |
853 const int16_t * const B= h->mv_cache[list][ index8 - 8 ]; | |
1169 | 854 const int16_t * C; |
855 int diagonal_ref, match_count; | |
856 | |
1168 | 857 assert(part_width==1 || part_width==2 || part_width==4); |
1169 | 858 |
1168 | 859 /* mv_cache |
860 B . . A T T T T | |
861 U . . L . . , . | |
862 U . . L . . . . | |
863 U . . L . . , . | |
864 . . . L . . . . | |
865 */ | |
1169 | 866 |
867 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width); | |
868 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref); | |
869 if(match_count > 1){ //most common | |
870 *mx= mid_pred(A[0], B[0], C[0]); | |
871 *my= mid_pred(A[1], B[1], C[1]); | |
872 }else if(match_count==1){ | |
873 if(left_ref==ref){ | |
874 *mx= A[0]; | |
875 *my= A[1]; | |
876 }else if(top_ref==ref){ | |
877 *mx= B[0]; | |
878 *my= B[1]; | |
879 }else{ | |
880 *mx= C[0]; | |
881 *my= C[1]; | |
882 } | |
883 }else{ | |
884 if(top_ref == PART_NOT_AVAILABLE && diagonal_ref == PART_NOT_AVAILABLE && left_ref != PART_NOT_AVAILABLE){ | |
885 *mx= A[0]; | |
886 *my= A[1]; | |
1168 | 887 }else{ |
888 *mx= mid_pred(A[0], B[0], C[0]); | |
889 *my= mid_pred(A[1], B[1], C[1]); | |
890 } | |
1169 | 891 } |
1168 | 892 |
1187 | 893 tprintf("pred_motion (%2d %2d %2d) (%2d %2d %2d) (%2d %2d %2d) -> (%2d %2d %2d) at %2d %2d %d list %d\n", top_ref, B[0], B[1], diagonal_ref, C[0], C[1], left_ref, A[0], A[1], ref, *mx, *my, h->s.mb_x, h->s.mb_y, n, list); |
1168 | 894 } |
895 | |
896 /** | |
897 * gets the directionally predicted 16x8 MV. | |
898 * @param n the block index | |
899 * @param mx the x component of the predicted motion vector | |
900 * @param my the y component of the predicted motion vector | |
901 */ | |
902 static inline void pred_16x8_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
903 if(n==0){ | |
904 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ]; | |
905 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ]; | |
906 | |
1187 | 907 tprintf("pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d", top_ref, B[0], B[1], h->s.mb_x, h->s.mb_y, n, list); |
1168 | 908 |
909 if(top_ref == ref){ | |
910 *mx= B[0]; | |
911 *my= B[1]; | |
912 return; | |
913 } | |
914 }else{ | |
915 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ]; | |
916 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ]; | |
917 | |
1187 | 918 tprintf("pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list); |
1168 | 919 |
920 if(left_ref == ref){ | |
921 *mx= A[0]; | |
922 *my= A[1]; | |
923 return; | |
924 } | |
925 } | |
926 | |
927 //RARE | |
928 pred_motion(h, n, 4, list, ref, mx, my); | |
929 } | |
930 | |
931 /** | |
932 * gets the directionally predicted 8x16 MV. | |
933 * @param n the block index | |
934 * @param mx the x component of the predicted motion vector | |
935 * @param my the y component of the predicted motion vector | |
936 */ | |
937 static inline void pred_8x16_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
938 if(n==0){ | |
939 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ]; | |
940 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ]; | |
941 | |
1187 | 942 tprintf("pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list); |
1168 | 943 |
944 if(left_ref == ref){ | |
945 *mx= A[0]; | |
946 *my= A[1]; | |
947 return; | |
948 } | |
949 }else{ | |
1169 | 950 const int16_t * C; |
951 int diagonal_ref; | |
952 | |
953 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2); | |
1168 | 954 |
1187 | 955 tprintf("pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d", diagonal_ref, C[0], C[1], h->s.mb_x, h->s.mb_y, n, list); |
1168 | 956 |
1169 | 957 if(diagonal_ref == ref){ |
1168 | 958 *mx= C[0]; |
959 *my= C[1]; | |
960 return; | |
961 } | |
962 } | |
963 | |
964 //RARE | |
965 pred_motion(h, n, 2, list, ref, mx, my); | |
966 } | |
967 | |
968 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){ | |
969 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ]; | |
970 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ]; | |
971 | |
1187 | 972 tprintf("pred_pskip: (%d) (%d) at %2d %2d", top_ref, left_ref, h->s.mb_x, h->s.mb_y); |
1168 | 973 |
974 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE | |
975 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0) | |
976 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){ | |
977 | |
978 *mx = *my = 0; | |
979 return; | |
980 } | |
981 | |
982 pred_motion(h, 0, 4, 0, 0, mx, my); | |
983 | |
984 return; | |
985 } | |
986 | |
987 static inline void write_back_motion(H264Context *h, int mb_type){ | |
988 MpegEncContext * const s = &h->s; | |
989 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
990 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
991 int list; | |
992 | |
993 for(list=0; list<2; list++){ | |
994 int y; | |
995 if((!IS_8X8(mb_type)) && !USES_LIST(mb_type, list)){ | |
996 if(1){ //FIXME skip or never read if mb_type doesnt use it | |
997 for(y=0; y<4; y++){ | |
998 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]= | |
999 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= 0; | |
1000 } | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1001 if( h->pps.cabac ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1002 /* FIXME needed ? */ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1003 for(y=0; y<4; y++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1004 *(uint64_t*)h->mvd_table[list][b_xy + 0 + y*h->b_stride]= |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1005 *(uint64_t*)h->mvd_table[list][b_xy + 2 + y*h->b_stride]= 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1006 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1007 } |
1168 | 1008 for(y=0; y<2; y++){ |
1009 *(uint16_t*)s->current_picture.motion_val[list][b8_xy + y*h->b8_stride]= (LIST_NOT_USED&0xFF)*0x0101; | |
1010 } | |
1011 } | |
1012 continue; //FIXME direct mode ... | |
1013 } | |
1014 | |
1015 for(y=0; y<4; y++){ | |
1016 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]= *(uint64_t*)h->mv_cache[list][scan8[0]+0 + 8*y]; | |
1017 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mv_cache[list][scan8[0]+2 + 8*y]; | |
1018 } | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1019 if( h->pps.cabac ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1020 for(y=0; y<4; y++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1021 *(uint64_t*)h->mvd_table[list][b_xy + 0 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+0 + 8*y]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1022 *(uint64_t*)h->mvd_table[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+2 + 8*y]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1023 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1024 } |
1168 | 1025 for(y=0; y<2; y++){ |
1026 s->current_picture.ref_index[list][b8_xy + 0 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+0 + 16*y]; | |
1027 s->current_picture.ref_index[list][b8_xy + 1 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+2 + 16*y]; | |
1028 } | |
1029 } | |
1030 } | |
1031 | |
1032 /** | |
1033 * Decodes a network abstraction layer unit. | |
1034 * @param consumed is the number of bytes used as input | |
1035 * @param length is the length of the array | |
1036 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp ttailing? | |
1037 * @returns decoded bytes, might be src+1 if no escapes | |
1038 */ | |
1039 static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *consumed, int length){ | |
1040 int i, si, di; | |
1041 uint8_t *dst; | |
1042 | |
1043 // src[0]&0x80; //forbidden bit | |
1044 h->nal_ref_idc= src[0]>>5; | |
1045 h->nal_unit_type= src[0]&0x1F; | |
1046 | |
1047 src++; length--; | |
1048 #if 0 | |
1049 for(i=0; i<length; i++) | |
1050 printf("%2X ", src[i]); | |
1051 #endif | |
1052 for(i=0; i+1<length; i+=2){ | |
1053 if(src[i]) continue; | |
1054 if(i>0 && src[i-1]==0) i--; | |
1055 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
1056 if(src[i+2]!=3){ | |
1057 /* startcode, so we must be past the end */ | |
1058 length=i; | |
1059 } | |
1060 break; | |
1061 } | |
1062 } | |
1063 | |
1064 if(i>=length-1){ //no escaped 0 | |
1065 *dst_length= length; | |
1066 *consumed= length+1; //+1 for the header | |
1067 return src; | |
1068 } | |
1069 | |
1070 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length); | |
1071 dst= h->rbsp_buffer; | |
1072 | |
1073 //printf("deoding esc\n"); | |
1074 si=di=0; | |
1075 while(si<length){ | |
1076 //remove escapes (very rare 1:2^22) | |
1077 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
1078 if(src[si+2]==3){ //escape | |
1079 dst[di++]= 0; | |
1080 dst[di++]= 0; | |
1081 si+=3; | |
1957
54411768fa38
h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1956
diff
changeset
|
1082 continue; |
1168 | 1083 }else //next start code |
1084 break; | |
1085 } | |
1086 | |
1087 dst[di++]= src[si++]; | |
1088 } | |
1089 | |
1090 *dst_length= di; | |
1091 *consumed= si + 1;//+1 for the header | |
1092 //FIXME store exact number of bits in the getbitcontext (its needed for decoding) | |
1093 return dst; | |
1094 } | |
1095 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1096 #if 0 |
1168 | 1097 /** |
1098 * @param src the data which should be escaped | |
1099 * @param dst the target buffer, dst+1 == src is allowed as a special case | |
1100 * @param length the length of the src data | |
1101 * @param dst_length the length of the dst array | |
1102 * @returns length of escaped data in bytes or -1 if an error occured | |
1103 */ | |
1104 static int encode_nal(H264Context *h, uint8_t *dst, uint8_t *src, int length, int dst_length){ | |
1105 int i, escape_count, si, di; | |
1106 uint8_t *temp; | |
1107 | |
1108 assert(length>=0); | |
1109 assert(dst_length>0); | |
1110 | |
1111 dst[0]= (h->nal_ref_idc<<5) + h->nal_unit_type; | |
1112 | |
1113 if(length==0) return 1; | |
1114 | |
1115 escape_count= 0; | |
1116 for(i=0; i<length; i+=2){ | |
1117 if(src[i]) continue; | |
1118 if(i>0 && src[i-1]==0) | |
1119 i--; | |
1120 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
1121 escape_count++; | |
1122 i+=2; | |
1123 } | |
1124 } | |
1125 | |
1126 if(escape_count==0){ | |
1127 if(dst+1 != src) | |
1128 memcpy(dst+1, src, length); | |
1129 return length + 1; | |
1130 } | |
1131 | |
1132 if(length + escape_count + 1> dst_length) | |
1133 return -1; | |
1134 | |
1135 //this should be damn rare (hopefully) | |
1136 | |
1137 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length + escape_count); | |
1138 temp= h->rbsp_buffer; | |
1139 //printf("encoding esc\n"); | |
1140 | |
1141 si= 0; | |
1142 di= 0; | |
1143 while(si < length){ | |
1144 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
1145 temp[di++]= 0; si++; | |
1146 temp[di++]= 0; si++; | |
1147 temp[di++]= 3; | |
1148 temp[di++]= src[si++]; | |
1149 } | |
1150 else | |
1151 temp[di++]= src[si++]; | |
1152 } | |
1153 memcpy(dst+1, temp, length+escape_count); | |
1154 | |
1155 assert(di == length+escape_count); | |
1156 | |
1157 return di + 1; | |
1158 } | |
1159 | |
1160 /** | |
1161 * write 1,10,100,1000,... for alignment, yes its exactly inverse to mpeg4 | |
1162 */ | |
1163 static void encode_rbsp_trailing(PutBitContext *pb){ | |
1164 int length; | |
1165 put_bits(pb, 1, 1); | |
1786 | 1166 length= (-put_bits_count(pb))&7; |
1168 | 1167 if(length) put_bits(pb, length, 0); |
1168 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1169 #endif |
1168 | 1170 |
1171 /** | |
1172 * identifies the exact end of the bitstream | |
1173 * @return the length of the trailing, or 0 if damaged | |
1174 */ | |
1175 static int decode_rbsp_trailing(uint8_t *src){ | |
1176 int v= *src; | |
1177 int r; | |
1178 | |
1170 | 1179 tprintf("rbsp trailing %X\n", v); |
1168 | 1180 |
1181 for(r=1; r<9; r++){ | |
1182 if(v&1) return r; | |
1183 v>>=1; | |
1184 } | |
1185 return 0; | |
1186 } | |
1187 | |
1188 /** | |
1189 * idct tranforms the 16 dc values and dequantize them. | |
1190 * @param qp quantization parameter | |
1191 */ | |
1192 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
1193 const int qmul= dequant_coeff[qp][0]; | |
1194 #define stride 16 | |
1195 int i; | |
1196 int temp[16]; //FIXME check if this is a good idea | |
1197 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
1198 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
1199 | |
1200 //memset(block, 64, 2*256); | |
1201 //return; | |
1202 for(i=0; i<4; i++){ | |
1203 const int offset= y_offset[i]; | |
1204 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
1205 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
1206 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
1207 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
1208 | |
1209 temp[4*i+0]= z0+z3; | |
1210 temp[4*i+1]= z1+z2; | |
1211 temp[4*i+2]= z1-z2; | |
1212 temp[4*i+3]= z0-z3; | |
1213 } | |
1214 | |
1215 for(i=0; i<4; i++){ | |
1216 const int offset= x_offset[i]; | |
1217 const int z0= temp[4*0+i] + temp[4*2+i]; | |
1218 const int z1= temp[4*0+i] - temp[4*2+i]; | |
1219 const int z2= temp[4*1+i] - temp[4*3+i]; | |
1220 const int z3= temp[4*1+i] + temp[4*3+i]; | |
1221 | |
1222 block[stride*0 +offset]= ((z0 + z3)*qmul + 2)>>2; //FIXME think about merging this into decode_resdual | |
1223 block[stride*2 +offset]= ((z1 + z2)*qmul + 2)>>2; | |
1224 block[stride*8 +offset]= ((z1 - z2)*qmul + 2)>>2; | |
1225 block[stride*10+offset]= ((z0 - z3)*qmul + 2)>>2; | |
1226 } | |
1227 } | |
1228 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1229 #if 0 |
1168 | 1230 /** |
1231 * dct tranforms the 16 dc values. | |
1232 * @param qp quantization parameter ??? FIXME | |
1233 */ | |
1234 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){ | |
1235 // const int qmul= dequant_coeff[qp][0]; | |
1236 int i; | |
1237 int temp[16]; //FIXME check if this is a good idea | |
1238 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
1239 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
1240 | |
1241 for(i=0; i<4; i++){ | |
1242 const int offset= y_offset[i]; | |
1243 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
1244 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
1245 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
1246 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
1247 | |
1248 temp[4*i+0]= z0+z3; | |
1249 temp[4*i+1]= z1+z2; | |
1250 temp[4*i+2]= z1-z2; | |
1251 temp[4*i+3]= z0-z3; | |
1252 } | |
1253 | |
1254 for(i=0; i<4; i++){ | |
1255 const int offset= x_offset[i]; | |
1256 const int z0= temp[4*0+i] + temp[4*2+i]; | |
1257 const int z1= temp[4*0+i] - temp[4*2+i]; | |
1258 const int z2= temp[4*1+i] - temp[4*3+i]; | |
1259 const int z3= temp[4*1+i] + temp[4*3+i]; | |
1260 | |
1261 block[stride*0 +offset]= (z0 + z3)>>1; | |
1262 block[stride*2 +offset]= (z1 + z2)>>1; | |
1263 block[stride*8 +offset]= (z1 - z2)>>1; | |
1264 block[stride*10+offset]= (z0 - z3)>>1; | |
1265 } | |
1266 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1267 #endif |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1268 |
1168 | 1269 #undef xStride |
1270 #undef stride | |
1271 | |
1272 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
1273 const int qmul= dequant_coeff[qp][0]; | |
1274 const int stride= 16*2; | |
1275 const int xStride= 16; | |
1276 int a,b,c,d,e; | |
1277 | |
1278 a= block[stride*0 + xStride*0]; | |
1279 b= block[stride*0 + xStride*1]; | |
1280 c= block[stride*1 + xStride*0]; | |
1281 d= block[stride*1 + xStride*1]; | |
1282 | |
1283 e= a-b; | |
1284 a= a+b; | |
1285 b= c-d; | |
1286 c= c+d; | |
1287 | |
1288 block[stride*0 + xStride*0]= ((a+c)*qmul + 0)>>1; | |
1289 block[stride*0 + xStride*1]= ((e+b)*qmul + 0)>>1; | |
1290 block[stride*1 + xStride*0]= ((a-c)*qmul + 0)>>1; | |
1291 block[stride*1 + xStride*1]= ((e-b)*qmul + 0)>>1; | |
1292 } | |
1293 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1294 #if 0 |
1168 | 1295 static void chroma_dc_dct_c(DCTELEM *block){ |
1296 const int stride= 16*2; | |
1297 const int xStride= 16; | |
1298 int a,b,c,d,e; | |
1299 | |
1300 a= block[stride*0 + xStride*0]; | |
1301 b= block[stride*0 + xStride*1]; | |
1302 c= block[stride*1 + xStride*0]; | |
1303 d= block[stride*1 + xStride*1]; | |
1304 | |
1305 e= a-b; | |
1306 a= a+b; | |
1307 b= c-d; | |
1308 c= c+d; | |
1309 | |
1310 block[stride*0 + xStride*0]= (a+c); | |
1311 block[stride*0 + xStride*1]= (e+b); | |
1312 block[stride*1 + xStride*0]= (a-c); | |
1313 block[stride*1 + xStride*1]= (e-b); | |
1314 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1315 #endif |
1168 | 1316 |
1317 /** | |
1318 * gets the chroma qp. | |
1319 */ | |
1320 static inline int get_chroma_qp(H264Context *h, int qscale){ | |
1321 | |
1322 return chroma_qp[clip(qscale + h->pps.chroma_qp_index_offset, 0, 51)]; | |
1323 } | |
1324 | |
1325 | |
1326 /** | |
1327 * | |
1328 */ | |
1329 static void h264_add_idct_c(uint8_t *dst, DCTELEM *block, int stride){ | |
1330 int i; | |
1331 uint8_t *cm = cropTbl + MAX_NEG_CROP; | |
1332 | |
1333 block[0] += 32; | |
1909 | 1334 |
1168 | 1335 for(i=0; i<4; i++){ |
1336 const int z0= block[0 + 4*i] + block[2 + 4*i]; | |
1337 const int z1= block[0 + 4*i] - block[2 + 4*i]; | |
1338 const int z2= (block[1 + 4*i]>>1) - block[3 + 4*i]; | |
1339 const int z3= block[1 + 4*i] + (block[3 + 4*i]>>1); | |
1340 | |
1341 block[0 + 4*i]= z0 + z3; | |
1342 block[1 + 4*i]= z1 + z2; | |
1343 block[2 + 4*i]= z1 - z2; | |
1344 block[3 + 4*i]= z0 - z3; | |
1345 } | |
1346 | |
1347 for(i=0; i<4; i++){ | |
1348 const int z0= block[i + 4*0] + block[i + 4*2]; | |
1349 const int z1= block[i + 4*0] - block[i + 4*2]; | |
1350 const int z2= (block[i + 4*1]>>1) - block[i + 4*3]; | |
1351 const int z3= block[i + 4*1] + (block[i + 4*3]>>1); | |
1352 | |
1353 dst[i + 0*stride]= cm[ dst[i + 0*stride] + ((z0 + z3) >> 6) ]; | |
1354 dst[i + 1*stride]= cm[ dst[i + 1*stride] + ((z1 + z2) >> 6) ]; | |
1355 dst[i + 2*stride]= cm[ dst[i + 2*stride] + ((z1 - z2) >> 6) ]; | |
1356 dst[i + 3*stride]= cm[ dst[i + 3*stride] + ((z0 - z3) >> 6) ]; | |
1357 } | |
1358 } | |
1359 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1360 #if 0 |
1168 | 1361 static void h264_diff_dct_c(DCTELEM *block, uint8_t *src1, uint8_t *src2, int stride){ |
1362 int i; | |
1363 //FIXME try int temp instead of block | |
1364 | |
1365 for(i=0; i<4; i++){ | |
1366 const int d0= src1[0 + i*stride] - src2[0 + i*stride]; | |
1367 const int d1= src1[1 + i*stride] - src2[1 + i*stride]; | |
1368 const int d2= src1[2 + i*stride] - src2[2 + i*stride]; | |
1369 const int d3= src1[3 + i*stride] - src2[3 + i*stride]; | |
1370 const int z0= d0 + d3; | |
1371 const int z3= d0 - d3; | |
1372 const int z1= d1 + d2; | |
1373 const int z2= d1 - d2; | |
1374 | |
1375 block[0 + 4*i]= z0 + z1; | |
1376 block[1 + 4*i]= 2*z3 + z2; | |
1377 block[2 + 4*i]= z0 - z1; | |
1378 block[3 + 4*i]= z3 - 2*z2; | |
1379 } | |
1380 | |
1381 for(i=0; i<4; i++){ | |
1382 const int z0= block[0*4 + i] + block[3*4 + i]; | |
1383 const int z3= block[0*4 + i] - block[3*4 + i]; | |
1384 const int z1= block[1*4 + i] + block[2*4 + i]; | |
1385 const int z2= block[1*4 + i] - block[2*4 + i]; | |
1386 | |
1387 block[0*4 + i]= z0 + z1; | |
1388 block[1*4 + i]= 2*z3 + z2; | |
1389 block[2*4 + i]= z0 - z1; | |
1390 block[3*4 + i]= z3 - 2*z2; | |
1391 } | |
1392 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1393 #endif |
1168 | 1394 |
1395 //FIXME need to check that this doesnt overflow signed 32 bit for low qp, iam not sure, its very close | |
1396 //FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away) | |
1397 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int seperate_dc){ | |
1398 int i; | |
1399 const int * const quant_table= quant_coeff[qscale]; | |
1400 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6; | |
1401 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1; | |
1402 const unsigned int threshold2= (threshold1<<1); | |
1403 int last_non_zero; | |
1404 | |
1405 if(seperate_dc){ | |
1406 if(qscale<=18){ | |
1407 //avoid overflows | |
1408 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6; | |
1409 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1; | |
1410 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
1411 | |
1412 int level= block[0]*quant_coeff[qscale+18][0]; | |
1413 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
1414 if(level>0){ | |
1415 level= (dc_bias + level)>>(QUANT_SHIFT-2); | |
1416 block[0]= level; | |
1417 }else{ | |
1418 level= (dc_bias - level)>>(QUANT_SHIFT-2); | |
1419 block[0]= -level; | |
1420 } | |
1421 // last_non_zero = i; | |
1422 }else{ | |
1423 block[0]=0; | |
1424 } | |
1425 }else{ | |
1426 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6; | |
1427 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1; | |
1428 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
1429 | |
1430 int level= block[0]*quant_table[0]; | |
1431 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
1432 if(level>0){ | |
1433 level= (dc_bias + level)>>(QUANT_SHIFT+1); | |
1434 block[0]= level; | |
1435 }else{ | |
1436 level= (dc_bias - level)>>(QUANT_SHIFT+1); | |
1437 block[0]= -level; | |
1438 } | |
1439 // last_non_zero = i; | |
1440 }else{ | |
1441 block[0]=0; | |
1442 } | |
1443 } | |
1444 last_non_zero= 0; | |
1445 i=1; | |
1446 }else{ | |
1447 last_non_zero= -1; | |
1448 i=0; | |
1449 } | |
1450 | |
1451 for(; i<16; i++){ | |
1452 const int j= scantable[i]; | |
1453 int level= block[j]*quant_table[j]; | |
1454 | |
1455 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
1456 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
1457 if(((unsigned)(level+threshold1))>threshold2){ | |
1458 if(level>0){ | |
1459 level= (bias + level)>>QUANT_SHIFT; | |
1460 block[j]= level; | |
1461 }else{ | |
1462 level= (bias - level)>>QUANT_SHIFT; | |
1463 block[j]= -level; | |
1464 } | |
1465 last_non_zero = i; | |
1466 }else{ | |
1467 block[j]=0; | |
1468 } | |
1469 } | |
1470 | |
1471 return last_non_zero; | |
1472 } | |
1473 | |
1474 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){ | |
1475 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
1476 ((uint32_t*)(src+0*stride))[0]= a; | |
1477 ((uint32_t*)(src+1*stride))[0]= a; | |
1478 ((uint32_t*)(src+2*stride))[0]= a; | |
1479 ((uint32_t*)(src+3*stride))[0]= a; | |
1480 } | |
1481 | |
1482 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){ | |
1483 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101; | |
1484 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101; | |
1485 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101; | |
1486 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101; | |
1487 } | |
1488 | |
1489 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
1490 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] | |
1491 + src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 4) >>3; | |
1492 | |
1493 ((uint32_t*)(src+0*stride))[0]= | |
1494 ((uint32_t*)(src+1*stride))[0]= | |
1495 ((uint32_t*)(src+2*stride))[0]= | |
1496 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
1497 } | |
1498 | |
1499 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
1500 const int dc= ( src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 2) >>2; | |
1501 | |
1502 ((uint32_t*)(src+0*stride))[0]= | |
1503 ((uint32_t*)(src+1*stride))[0]= | |
1504 ((uint32_t*)(src+2*stride))[0]= | |
1505 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
1506 } | |
1507 | |
1508 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
1509 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2; | |
1510 | |
1511 ((uint32_t*)(src+0*stride))[0]= | |
1512 ((uint32_t*)(src+1*stride))[0]= | |
1513 ((uint32_t*)(src+2*stride))[0]= | |
1514 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
1515 } | |
1516 | |
1517 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
1518 ((uint32_t*)(src+0*stride))[0]= | |
1519 ((uint32_t*)(src+1*stride))[0]= | |
1520 ((uint32_t*)(src+2*stride))[0]= | |
1521 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U; | |
1522 } | |
1523 | |
1524 | |
1525 #define LOAD_TOP_RIGHT_EDGE\ | |
1526 const int t4= topright[0];\ | |
1527 const int t5= topright[1];\ | |
1528 const int t6= topright[2];\ | |
1529 const int t7= topright[3];\ | |
1530 | |
1531 #define LOAD_LEFT_EDGE\ | |
1532 const int l0= src[-1+0*stride];\ | |
1533 const int l1= src[-1+1*stride];\ | |
1534 const int l2= src[-1+2*stride];\ | |
1535 const int l3= src[-1+3*stride];\ | |
1536 | |
1537 #define LOAD_TOP_EDGE\ | |
1538 const int t0= src[ 0-1*stride];\ | |
1539 const int t1= src[ 1-1*stride];\ | |
1540 const int t2= src[ 2-1*stride];\ | |
1541 const int t3= src[ 3-1*stride];\ | |
1542 | |
1543 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
1544 const int lt= src[-1-1*stride]; | |
1545 LOAD_TOP_EDGE | |
1546 LOAD_LEFT_EDGE | |
1547 | |
1548 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2; | |
1549 src[0+2*stride]= | |
1550 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2; | |
1551 src[0+1*stride]= | |
1552 src[1+2*stride]= | |
1553 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2; | |
1554 src[0+0*stride]= | |
1555 src[1+1*stride]= | |
1556 src[2+2*stride]= | |
1557 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
1558 src[1+0*stride]= | |
1559 src[2+1*stride]= | |
1560 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
1561 src[2+0*stride]= | |
1562 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
1563 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
1282 | 1564 } |
1168 | 1565 |
1566 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
1567 LOAD_TOP_EDGE | |
1568 LOAD_TOP_RIGHT_EDGE | |
1569 // LOAD_LEFT_EDGE | |
1570 | |
1571 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2; | |
1572 src[1+0*stride]= | |
1573 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2; | |
1574 src[2+0*stride]= | |
1575 src[1+1*stride]= | |
1576 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2; | |
1577 src[3+0*stride]= | |
1578 src[2+1*stride]= | |
1579 src[1+2*stride]= | |
1580 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2; | |
1581 src[3+1*stride]= | |
1582 src[2+2*stride]= | |
1583 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2; | |
1584 src[3+2*stride]= | |
1585 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2; | |
1586 src[3+3*stride]=(t6 + 3*t7 + 2)>>2; | |
1282 | 1587 } |
1168 | 1588 |
1589 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
1590 const int lt= src[-1-1*stride]; | |
1591 LOAD_TOP_EDGE | |
1592 LOAD_LEFT_EDGE | |
1593 const __attribute__((unused)) int unu= l3; | |
1594 | |
1595 src[0+0*stride]= | |
1596 src[1+2*stride]=(lt + t0 + 1)>>1; | |
1597 src[1+0*stride]= | |
1598 src[2+2*stride]=(t0 + t1 + 1)>>1; | |
1599 src[2+0*stride]= | |
1600 src[3+2*stride]=(t1 + t2 + 1)>>1; | |
1601 src[3+0*stride]=(t2 + t3 + 1)>>1; | |
1602 src[0+1*stride]= | |
1603 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
1604 src[1+1*stride]= | |
1605 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
1606 src[2+1*stride]= | |
1607 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
1608 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
1609 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
1610 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
1282 | 1611 } |
1168 | 1612 |
1613 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
1614 LOAD_TOP_EDGE | |
1615 LOAD_TOP_RIGHT_EDGE | |
1616 const __attribute__((unused)) int unu= t7; | |
1617 | |
1618 src[0+0*stride]=(t0 + t1 + 1)>>1; | |
1619 src[1+0*stride]= | |
1620 src[0+2*stride]=(t1 + t2 + 1)>>1; | |
1621 src[2+0*stride]= | |
1622 src[1+2*stride]=(t2 + t3 + 1)>>1; | |
1623 src[3+0*stride]= | |
1624 src[2+2*stride]=(t3 + t4+ 1)>>1; | |
1625 src[3+2*stride]=(t4 + t5+ 1)>>1; | |
1626 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
1627 src[1+1*stride]= | |
1628 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
1629 src[2+1*stride]= | |
1630 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2; | |
1631 src[3+1*stride]= | |
1632 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; | |
1633 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; | |
1282 | 1634 } |
1168 | 1635 |
1636 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ | |
1637 LOAD_LEFT_EDGE | |
1638 | |
1639 src[0+0*stride]=(l0 + l1 + 1)>>1; | |
1640 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
1641 src[2+0*stride]= | |
1642 src[0+1*stride]=(l1 + l2 + 1)>>1; | |
1643 src[3+0*stride]= | |
1644 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
1645 src[2+1*stride]= | |
1646 src[0+2*stride]=(l2 + l3 + 1)>>1; | |
1647 src[3+1*stride]= | |
1648 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2; | |
1649 src[3+2*stride]= | |
1650 src[1+3*stride]= | |
1651 src[0+3*stride]= | |
1652 src[2+2*stride]= | |
1653 src[2+3*stride]= | |
1654 src[3+3*stride]=l3; | |
1282 | 1655 } |
1168 | 1656 |
1657 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){ | |
1658 const int lt= src[-1-1*stride]; | |
1659 LOAD_TOP_EDGE | |
1660 LOAD_LEFT_EDGE | |
1661 const __attribute__((unused)) int unu= t3; | |
1662 | |
1663 src[0+0*stride]= | |
1664 src[2+1*stride]=(lt + l0 + 1)>>1; | |
1665 src[1+0*stride]= | |
1666 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
1667 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
1668 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
1669 src[0+1*stride]= | |
1670 src[2+2*stride]=(l0 + l1 + 1)>>1; | |
1671 src[1+1*stride]= | |
1672 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
1673 src[0+2*stride]= | |
1674 src[2+3*stride]=(l1 + l2+ 1)>>1; | |
1675 src[1+2*stride]= | |
1676 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
1677 src[0+3*stride]=(l2 + l3 + 1)>>1; | |
1678 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
1282 | 1679 } |
1168 | 1680 |
1681 static void pred16x16_vertical_c(uint8_t *src, int stride){ | |
1682 int i; | |
1683 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
1684 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
1685 const uint32_t c= ((uint32_t*)(src-stride))[2]; | |
1686 const uint32_t d= ((uint32_t*)(src-stride))[3]; | |
1687 | |
1688 for(i=0; i<16; i++){ | |
1689 ((uint32_t*)(src+i*stride))[0]= a; | |
1690 ((uint32_t*)(src+i*stride))[1]= b; | |
1691 ((uint32_t*)(src+i*stride))[2]= c; | |
1692 ((uint32_t*)(src+i*stride))[3]= d; | |
1693 } | |
1694 } | |
1695 | |
1696 static void pred16x16_horizontal_c(uint8_t *src, int stride){ | |
1697 int i; | |
1698 | |
1699 for(i=0; i<16; i++){ | |
1700 ((uint32_t*)(src+i*stride))[0]= | |
1701 ((uint32_t*)(src+i*stride))[1]= | |
1702 ((uint32_t*)(src+i*stride))[2]= | |
1703 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101; | |
1704 } | |
1705 } | |
1706 | |
1707 static void pred16x16_dc_c(uint8_t *src, int stride){ | |
1708 int i, dc=0; | |
1709 | |
1710 for(i=0;i<16; i++){ | |
1711 dc+= src[-1+i*stride]; | |
1712 } | |
1713 | |
1714 for(i=0;i<16; i++){ | |
1715 dc+= src[i-stride]; | |
1716 } | |
1717 | |
1718 dc= 0x01010101*((dc + 16)>>5); | |
1719 | |
1720 for(i=0; i<16; i++){ | |
1721 ((uint32_t*)(src+i*stride))[0]= | |
1722 ((uint32_t*)(src+i*stride))[1]= | |
1723 ((uint32_t*)(src+i*stride))[2]= | |
1724 ((uint32_t*)(src+i*stride))[3]= dc; | |
1725 } | |
1726 } | |
1727 | |
1728 static void pred16x16_left_dc_c(uint8_t *src, int stride){ | |
1729 int i, dc=0; | |
1730 | |
1731 for(i=0;i<16; i++){ | |
1732 dc+= src[-1+i*stride]; | |
1733 } | |
1734 | |
1735 dc= 0x01010101*((dc + 8)>>4); | |
1736 | |
1737 for(i=0; i<16; i++){ | |
1738 ((uint32_t*)(src+i*stride))[0]= | |
1739 ((uint32_t*)(src+i*stride))[1]= | |
1740 ((uint32_t*)(src+i*stride))[2]= | |
1741 ((uint32_t*)(src+i*stride))[3]= dc; | |
1742 } | |
1743 } | |
1744 | |
1745 static void pred16x16_top_dc_c(uint8_t *src, int stride){ | |
1746 int i, dc=0; | |
1747 | |
1748 for(i=0;i<16; i++){ | |
1749 dc+= src[i-stride]; | |
1750 } | |
1751 dc= 0x01010101*((dc + 8)>>4); | |
1752 | |
1753 for(i=0; i<16; i++){ | |
1754 ((uint32_t*)(src+i*stride))[0]= | |
1755 ((uint32_t*)(src+i*stride))[1]= | |
1756 ((uint32_t*)(src+i*stride))[2]= | |
1757 ((uint32_t*)(src+i*stride))[3]= dc; | |
1758 } | |
1759 } | |
1760 | |
1761 static void pred16x16_128_dc_c(uint8_t *src, int stride){ | |
1762 int i; | |
1763 | |
1764 for(i=0; i<16; i++){ | |
1765 ((uint32_t*)(src+i*stride))[0]= | |
1766 ((uint32_t*)(src+i*stride))[1]= | |
1767 ((uint32_t*)(src+i*stride))[2]= | |
1768 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U; | |
1769 } | |
1770 } | |
1771 | |
1234 | 1772 static inline void pred16x16_plane_compat_c(uint8_t *src, int stride, const int svq3){ |
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1773 int i, j, k; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1774 int a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1775 uint8_t *cm = cropTbl + MAX_NEG_CROP; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1776 const uint8_t * const src0 = src+7-stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1777 const uint8_t *src1 = src+8*stride-1; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1778 const uint8_t *src2 = src1-2*stride; // == src+6*stride-1; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1779 int H = src0[1] - src0[-1]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1780 int V = src1[0] - src2[ 0]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1781 for(k=2; k<=8; ++k) { |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1782 src1 += stride; src2 -= stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1783 H += k*(src0[k] - src0[-k]); |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1784 V += k*(src1[0] - src2[ 0]); |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1785 } |
1234 | 1786 if(svq3){ |
1787 H = ( 5*(H/4) ) / 16; | |
1788 V = ( 5*(V/4) ) / 16; | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1789 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1790 /* required for 100% accuracy */ |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1791 i = H; H = V; V = i; |
1234 | 1792 }else{ |
1793 H = ( 5*H+32 ) >> 6; | |
1794 V = ( 5*V+32 ) >> 6; | |
1795 } | |
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1796 |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1797 a = 16*(src1[0] + src2[16] + 1) - 7*(V+H); |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1798 for(j=16; j>0; --j) { |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1799 int b = a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1800 a += V; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1801 for(i=-16; i<0; i+=4) { |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1802 src[16+i] = cm[ (b ) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1803 src[17+i] = cm[ (b+ H) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1804 src[18+i] = cm[ (b+2*H) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1805 src[19+i] = cm[ (b+3*H) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1806 b += 4*H; |
1168 | 1807 } |
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1808 src += stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1809 } |
1168 | 1810 } |
1811 | |
1234 | 1812 static void pred16x16_plane_c(uint8_t *src, int stride){ |
1813 pred16x16_plane_compat_c(src, stride, 0); | |
1814 } | |
1815 | |
1168 | 1816 static void pred8x8_vertical_c(uint8_t *src, int stride){ |
1817 int i; | |
1818 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
1819 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
1820 | |
1821 for(i=0; i<8; i++){ | |
1822 ((uint32_t*)(src+i*stride))[0]= a; | |
1823 ((uint32_t*)(src+i*stride))[1]= b; | |
1824 } | |
1825 } | |
1826 | |
1827 static void pred8x8_horizontal_c(uint8_t *src, int stride){ | |
1828 int i; | |
1829 | |
1830 for(i=0; i<8; i++){ | |
1831 ((uint32_t*)(src+i*stride))[0]= | |
1832 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101; | |
1833 } | |
1834 } | |
1835 | |
1836 static void pred8x8_128_dc_c(uint8_t *src, int stride){ | |
1837 int i; | |
1838 | |
1839 for(i=0; i<4; i++){ | |
1840 ((uint32_t*)(src+i*stride))[0]= | |
1841 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; | |
1842 } | |
1843 for(i=4; i<8; i++){ | |
1844 ((uint32_t*)(src+i*stride))[0]= | |
1845 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; | |
1846 } | |
1847 } | |
1848 | |
1849 static void pred8x8_left_dc_c(uint8_t *src, int stride){ | |
1850 int i; | |
1851 int dc0, dc2; | |
1852 | |
1853 dc0=dc2=0; | |
1854 for(i=0;i<4; i++){ | |
1855 dc0+= src[-1+i*stride]; | |
1856 dc2+= src[-1+(i+4)*stride]; | |
1857 } | |
1858 dc0= 0x01010101*((dc0 + 2)>>2); | |
1859 dc2= 0x01010101*((dc2 + 2)>>2); | |
1860 | |
1861 for(i=0; i<4; i++){ | |
1862 ((uint32_t*)(src+i*stride))[0]= | |
1863 ((uint32_t*)(src+i*stride))[1]= dc0; | |
1864 } | |
1865 for(i=4; i<8; i++){ | |
1866 ((uint32_t*)(src+i*stride))[0]= | |
1867 ((uint32_t*)(src+i*stride))[1]= dc2; | |
1868 } | |
1869 } | |
1870 | |
1871 static void pred8x8_top_dc_c(uint8_t *src, int stride){ | |
1872 int i; | |
1873 int dc0, dc1; | |
1874 | |
1875 dc0=dc1=0; | |
1876 for(i=0;i<4; i++){ | |
1877 dc0+= src[i-stride]; | |
1878 dc1+= src[4+i-stride]; | |
1879 } | |
1880 dc0= 0x01010101*((dc0 + 2)>>2); | |
1881 dc1= 0x01010101*((dc1 + 2)>>2); | |
1882 | |
1883 for(i=0; i<4; i++){ | |
1884 ((uint32_t*)(src+i*stride))[0]= dc0; | |
1885 ((uint32_t*)(src+i*stride))[1]= dc1; | |
1886 } | |
1887 for(i=4; i<8; i++){ | |
1888 ((uint32_t*)(src+i*stride))[0]= dc0; | |
1889 ((uint32_t*)(src+i*stride))[1]= dc1; | |
1890 } | |
1891 } | |
1892 | |
1893 | |
1894 static void pred8x8_dc_c(uint8_t *src, int stride){ | |
1895 int i; | |
1896 int dc0, dc1, dc2, dc3; | |
1897 | |
1898 dc0=dc1=dc2=0; | |
1899 for(i=0;i<4; i++){ | |
1900 dc0+= src[-1+i*stride] + src[i-stride]; | |
1901 dc1+= src[4+i-stride]; | |
1902 dc2+= src[-1+(i+4)*stride]; | |
1903 } | |
1904 dc3= 0x01010101*((dc1 + dc2 + 4)>>3); | |
1905 dc0= 0x01010101*((dc0 + 4)>>3); | |
1906 dc1= 0x01010101*((dc1 + 2)>>2); | |
1907 dc2= 0x01010101*((dc2 + 2)>>2); | |
1908 | |
1909 for(i=0; i<4; i++){ | |
1910 ((uint32_t*)(src+i*stride))[0]= dc0; | |
1911 ((uint32_t*)(src+i*stride))[1]= dc1; | |
1912 } | |
1913 for(i=4; i<8; i++){ | |
1914 ((uint32_t*)(src+i*stride))[0]= dc2; | |
1915 ((uint32_t*)(src+i*stride))[1]= dc3; | |
1916 } | |
1917 } | |
1918 | |
1919 static void pred8x8_plane_c(uint8_t *src, int stride){ | |
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1920 int j, k; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1921 int a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1922 uint8_t *cm = cropTbl + MAX_NEG_CROP; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1923 const uint8_t * const src0 = src+3-stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1924 const uint8_t *src1 = src+4*stride-1; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1925 const uint8_t *src2 = src1-2*stride; // == src+2*stride-1; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1926 int H = src0[1] - src0[-1]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1927 int V = src1[0] - src2[ 0]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1928 for(k=2; k<=4; ++k) { |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1929 src1 += stride; src2 -= stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1930 H += k*(src0[k] - src0[-k]); |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1931 V += k*(src1[0] - src2[ 0]); |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1932 } |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1933 H = ( 17*H+16 ) >> 5; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1934 V = ( 17*V+16 ) >> 5; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1935 |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1936 a = 16*(src1[0] + src2[8]+1) - 3*(V+H); |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1937 for(j=8; j>0; --j) { |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1938 int b = a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1939 a += V; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1940 src[0] = cm[ (b ) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1941 src[1] = cm[ (b+ H) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1942 src[2] = cm[ (b+2*H) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1943 src[3] = cm[ (b+3*H) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1944 src[4] = cm[ (b+4*H) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1945 src[5] = cm[ (b+5*H) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1946 src[6] = cm[ (b+6*H) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1947 src[7] = cm[ (b+7*H) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1948 src += stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1949 } |
1168 | 1950 } |
1951 | |
1952 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list, | |
1953 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
1954 int src_x_offset, int src_y_offset, | |
1955 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){ | |
1956 MpegEncContext * const s = &h->s; | |
1957 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8; | |
1958 const int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8; | |
1959 const int luma_xy= (mx&3) + ((my&3)<<2); | |
1960 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*s->linesize; | |
1961 uint8_t * src_cb= pic->data[1] + (mx>>3) + (my>>3)*s->uvlinesize; | |
1962 uint8_t * src_cr= pic->data[2] + (mx>>3) + (my>>3)*s->uvlinesize; | |
1963 int extra_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; //FIXME increase edge?, IMHO not worth it | |
1964 int extra_height= extra_width; | |
1965 int emu=0; | |
1966 const int full_mx= mx>>2; | |
1967 const int full_my= my>>2; | |
1968 | |
1969 assert(pic->data[0]); | |
1970 | |
1971 if(mx&7) extra_width -= 3; | |
1972 if(my&7) extra_height -= 3; | |
1973 | |
1974 if( full_mx < 0-extra_width | |
1975 || full_my < 0-extra_height | |
1976 || full_mx + 16/*FIXME*/ > s->width + extra_width | |
1977 || full_my + 16/*FIXME*/ > s->height + extra_height){ | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
1978 ff_emulated_edge_mc(s->edge_emu_buffer, src_y - 2 - 2*s->linesize, s->linesize, 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, s->width, s->height); |
1168 | 1979 src_y= s->edge_emu_buffer + 2 + 2*s->linesize; |
1980 emu=1; | |
1981 } | |
1982 | |
1983 qpix_op[luma_xy](dest_y, src_y, s->linesize); //FIXME try variable height perhaps? | |
1984 if(!square){ | |
1985 qpix_op[luma_xy](dest_y + delta, src_y + delta, s->linesize); | |
1986 } | |
1987 | |
1988 if(s->flags&CODEC_FLAG_GRAY) return; | |
1989 | |
1990 if(emu){ | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
1991 ff_emulated_edge_mc(s->edge_emu_buffer, src_cb, s->uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), s->width>>1, s->height>>1); |
1168 | 1992 src_cb= s->edge_emu_buffer; |
1993 } | |
1994 chroma_op(dest_cb, src_cb, s->uvlinesize, chroma_height, mx&7, my&7); | |
1995 | |
1996 if(emu){ | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
1997 ff_emulated_edge_mc(s->edge_emu_buffer, src_cr, s->uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), s->width>>1, s->height>>1); |
1168 | 1998 src_cr= s->edge_emu_buffer; |
1999 } | |
2000 chroma_op(dest_cr, src_cr, s->uvlinesize, chroma_height, mx&7, my&7); | |
2001 } | |
2002 | |
2003 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta, | |
2004 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
2005 int x_offset, int y_offset, | |
2006 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
2007 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
2008 int list0, int list1){ | |
2009 MpegEncContext * const s = &h->s; | |
2010 qpel_mc_func *qpix_op= qpix_put; | |
2011 h264_chroma_mc_func chroma_op= chroma_put; | |
2012 | |
2013 dest_y += 2*x_offset + 2*y_offset*s-> linesize; | |
2014 dest_cb += x_offset + y_offset*s->uvlinesize; | |
2015 dest_cr += x_offset + y_offset*s->uvlinesize; | |
2016 x_offset += 8*s->mb_x; | |
2017 y_offset += 8*s->mb_y; | |
2018 | |
2019 if(list0){ | |
1169 | 2020 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ]; |
1168 | 2021 mc_dir_part(h, ref, n, square, chroma_height, delta, 0, |
2022 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2023 qpix_op, chroma_op); | |
2024 | |
2025 qpix_op= qpix_avg; | |
2026 chroma_op= chroma_avg; | |
2027 } | |
2028 | |
2029 if(list1){ | |
1169 | 2030 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ]; |
1168 | 2031 mc_dir_part(h, ref, n, square, chroma_height, delta, 1, |
2032 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2033 qpix_op, chroma_op); | |
2034 } | |
2035 } | |
2036 | |
2037 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
2038 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put), | |
2039 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg)){ | |
2040 MpegEncContext * const s = &h->s; | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2041 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 2042 const int mb_type= s->current_picture.mb_type[mb_xy]; |
2043 | |
2044 assert(IS_INTER(mb_type)); | |
2045 | |
2046 if(IS_16X16(mb_type)){ | |
2047 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0, | |
2048 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0], | |
2049 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); | |
2050 }else if(IS_16X8(mb_type)){ | |
2051 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0, | |
2052 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
2053 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); | |
2054 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4, | |
2055 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
2056 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); | |
2057 }else if(IS_8X16(mb_type)){ | |
2058 mc_part(h, 0, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 0, 0, | |
2059 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
2060 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); | |
2061 mc_part(h, 4, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 4, 0, | |
2062 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
2063 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); | |
2064 }else{ | |
2065 int i; | |
2066 | |
2067 assert(IS_8X8(mb_type)); | |
2068 | |
2069 for(i=0; i<4; i++){ | |
2070 const int sub_mb_type= h->sub_mb_type[i]; | |
2071 const int n= 4*i; | |
2072 int x_offset= (i&1)<<2; | |
2073 int y_offset= (i&2)<<1; | |
2074 | |
2075 if(IS_SUB_8X8(sub_mb_type)){ | |
2076 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2077 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
2078 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
2079 }else if(IS_SUB_8X4(sub_mb_type)){ | |
2080 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2081 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
2082 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
2083 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2, | |
2084 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
2085 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
2086 }else if(IS_SUB_4X8(sub_mb_type)){ | |
2087 mc_part(h, n , 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2088 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
2089 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
2090 mc_part(h, n+1, 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset, | |
2091 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
2092 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
2093 }else{ | |
2094 int j; | |
2095 assert(IS_SUB_4X4(sub_mb_type)); | |
2096 for(j=0; j<4; j++){ | |
2097 int sub_x_offset= x_offset + 2*(j&1); | |
2098 int sub_y_offset= y_offset + (j&2); | |
2099 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset, | |
2100 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
2101 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
2102 } | |
2103 } | |
2104 } | |
2105 } | |
2106 } | |
2107 | |
2108 static void decode_init_vlc(H264Context *h){ | |
2109 static int done = 0; | |
2110 | |
2111 if (!done) { | |
2112 int i; | |
2113 done = 1; | |
2114 | |
2115 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5, | |
2116 &chroma_dc_coeff_token_len [0], 1, 1, | |
2117 &chroma_dc_coeff_token_bits[0], 1, 1); | |
2118 | |
2119 for(i=0; i<4; i++){ | |
2120 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17, | |
2121 &coeff_token_len [i][0], 1, 1, | |
2122 &coeff_token_bits[i][0], 1, 1); | |
2123 } | |
2124 | |
2125 for(i=0; i<3; i++){ | |
2126 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4, | |
2127 &chroma_dc_total_zeros_len [i][0], 1, 1, | |
2128 &chroma_dc_total_zeros_bits[i][0], 1, 1); | |
2129 } | |
2130 for(i=0; i<15; i++){ | |
2131 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16, | |
2132 &total_zeros_len [i][0], 1, 1, | |
2133 &total_zeros_bits[i][0], 1, 1); | |
2134 } | |
2135 | |
2136 for(i=0; i<6; i++){ | |
2137 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7, | |
2138 &run_len [i][0], 1, 1, | |
2139 &run_bits[i][0], 1, 1); | |
2140 } | |
2141 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16, | |
2142 &run_len [6][0], 1, 1, | |
2143 &run_bits[6][0], 1, 1); | |
2144 } | |
2145 } | |
2146 | |
2147 /** | |
2148 * Sets the intra prediction function pointers. | |
2149 */ | |
2150 static void init_pred_ptrs(H264Context *h){ | |
2151 // MpegEncContext * const s = &h->s; | |
2152 | |
2153 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; | |
2154 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; | |
2155 h->pred4x4[DC_PRED ]= pred4x4_dc_c; | |
2156 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c; | |
2157 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c; | |
2158 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c; | |
2159 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c; | |
2160 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c; | |
2161 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c; | |
2162 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c; | |
2163 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c; | |
2164 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; | |
2165 | |
2166 h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c; | |
2167 h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c; | |
2168 h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c; | |
2169 h->pred8x8[PLANE_PRED8x8 ]= pred8x8_plane_c; | |
2170 h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c; | |
2171 h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c; | |
2172 h->pred8x8[DC_128_PRED8x8 ]= pred8x8_128_dc_c; | |
2173 | |
2174 h->pred16x16[DC_PRED8x8 ]= pred16x16_dc_c; | |
2175 h->pred16x16[VERT_PRED8x8 ]= pred16x16_vertical_c; | |
2176 h->pred16x16[HOR_PRED8x8 ]= pred16x16_horizontal_c; | |
2177 h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c; | |
2178 h->pred16x16[LEFT_DC_PRED8x8]= pred16x16_left_dc_c; | |
2179 h->pred16x16[TOP_DC_PRED8x8 ]= pred16x16_top_dc_c; | |
2180 h->pred16x16[DC_128_PRED8x8 ]= pred16x16_128_dc_c; | |
2181 } | |
2182 | |
2183 static void free_tables(H264Context *h){ | |
2184 av_freep(&h->intra4x4_pred_mode); | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2185 av_freep(&h->chroma_pred_mode_table); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2186 av_freep(&h->cbp_table); |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2187 av_freep(&h->mvd_table[0]); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2188 av_freep(&h->mvd_table[1]); |
1168 | 2189 av_freep(&h->non_zero_count); |
2190 av_freep(&h->slice_table_base); | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2191 av_freep(&h->top_border); |
1168 | 2192 h->slice_table= NULL; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2193 |
1168 | 2194 av_freep(&h->mb2b_xy); |
2195 av_freep(&h->mb2b8_xy); | |
2196 } | |
2197 | |
2198 /** | |
2199 * allocates tables. | |
2200 * needs widzh/height | |
2201 */ | |
2202 static int alloc_tables(H264Context *h){ | |
2203 MpegEncContext * const s = &h->s; | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2204 const int big_mb_num= s->mb_stride * (s->mb_height+1); |
1168 | 2205 int x,y; |
2206 | |
2207 CHECKED_ALLOCZ(h->intra4x4_pred_mode, big_mb_num * 8 * sizeof(uint8_t)) | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2208 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2209 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t)) |
1168 | 2210 CHECKED_ALLOCZ(h->slice_table_base , big_mb_num * sizeof(uint8_t)) |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2211 CHECKED_ALLOCZ(h->top_border , s->mb_width * (16+8+8) * sizeof(uint8_t)) |
1168 | 2212 |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2213 if( h->pps.cabac ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2214 CHECKED_ALLOCZ(h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t)) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2215 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t)) |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2216 CHECKED_ALLOCZ(h->mvd_table[0], 32*big_mb_num * sizeof(uint16_t)); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2217 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t)); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2218 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2219 |
1168 | 2220 memset(h->slice_table_base, -1, big_mb_num * sizeof(uint8_t)); |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2221 h->slice_table= h->slice_table_base + s->mb_stride + 1; |
1168 | 2222 |
2223 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint16_t)); | |
2224 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint16_t)); | |
2225 for(y=0; y<s->mb_height; y++){ | |
2226 for(x=0; x<s->mb_width; x++){ | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2227 const int mb_xy= x + y*s->mb_stride; |
1168 | 2228 const int b_xy = 4*x + 4*y*h->b_stride; |
2229 const int b8_xy= 2*x + 2*y*h->b8_stride; | |
2230 | |
2231 h->mb2b_xy [mb_xy]= b_xy; | |
2232 h->mb2b8_xy[mb_xy]= b8_xy; | |
2233 } | |
2234 } | |
2235 | |
2236 return 0; | |
2237 fail: | |
2238 free_tables(h); | |
2239 return -1; | |
2240 } | |
2241 | |
2242 static void common_init(H264Context *h){ | |
2243 MpegEncContext * const s = &h->s; | |
2244 | |
2245 s->width = s->avctx->width; | |
2246 s->height = s->avctx->height; | |
2247 s->codec_id= s->avctx->codec->id; | |
2248 | |
2249 init_pred_ptrs(h); | |
2250 | |
1698 | 2251 s->unrestricted_mv=1; |
1168 | 2252 s->decode=1; //FIXME |
2253 } | |
2254 | |
2255 static int decode_init(AVCodecContext *avctx){ | |
2256 H264Context *h= avctx->priv_data; | |
2257 MpegEncContext * const s = &h->s; | |
2258 | |
1892 | 2259 MPV_decode_defaults(s); |
2260 | |
1168 | 2261 s->avctx = avctx; |
2262 common_init(h); | |
2263 | |
2264 s->out_format = FMT_H264; | |
2265 s->workaround_bugs= avctx->workaround_bugs; | |
2266 | |
2267 // set defaults | |
2268 // s->decode_mb= ff_h263_decode_mb; | |
2269 s->low_delay= 1; | |
2270 avctx->pix_fmt= PIX_FMT_YUV420P; | |
2271 | |
2272 decode_init_vlc(h); | |
2273 | |
2227 | 2274 if(avctx->codec_tag != 0x31637661) // avc1 |
2275 h->is_avc = 0; | |
2276 else { | |
2277 if((avctx->extradata_size == 0) || (avctx->extradata == NULL)) { | |
2278 av_log(avctx, AV_LOG_ERROR, "AVC codec requires avcC data\n"); | |
2279 return -1; | |
2280 } | |
2281 h->is_avc = 1; | |
2282 h->got_avcC = 0; | |
2283 } | |
2284 | |
1168 | 2285 return 0; |
2286 } | |
2287 | |
2288 static void frame_start(H264Context *h){ | |
2289 MpegEncContext * const s = &h->s; | |
2290 int i; | |
2291 | |
2292 MPV_frame_start(s, s->avctx); | |
2293 ff_er_frame_start(s); | |
2294 h->mmco_index=0; | |
2295 | |
2296 assert(s->linesize && s->uvlinesize); | |
2297 | |
2298 for(i=0; i<16; i++){ | |
2299 h->block_offset[i]= 4*((scan8[i] - scan8[0])&7) + 4*s->linesize*((scan8[i] - scan8[0])>>3); | |
2300 h->chroma_subblock_offset[i]= 2*((scan8[i] - scan8[0])&7) + 2*s->uvlinesize*((scan8[i] - scan8[0])>>3); | |
2301 } | |
2302 for(i=0; i<4; i++){ | |
2303 h->block_offset[16+i]= | |
2304 h->block_offset[20+i]= 4*((scan8[i] - scan8[0])&7) + 4*s->uvlinesize*((scan8[i] - scan8[0])>>3); | |
2305 } | |
2306 | |
2307 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; | |
2308 } | |
2309 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2310 static inline void backup_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize){ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2311 MpegEncContext * const s = &h->s; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2312 int i; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2313 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2314 src_y -= linesize; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2315 src_cb -= uvlinesize; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2316 src_cr -= uvlinesize; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2317 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2318 h->left_border[0]= h->top_border[s->mb_x][15]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2319 for(i=1; i<17; i++){ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2320 h->left_border[i]= src_y[15+i* linesize]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2321 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2322 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2323 *(uint64_t*)(h->top_border[s->mb_x]+0)= *(uint64_t*)(src_y + 16*linesize); |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2324 *(uint64_t*)(h->top_border[s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize); |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2325 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2326 if(!(s->flags&CODEC_FLAG_GRAY)){ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2327 h->left_border[17 ]= h->top_border[s->mb_x][16+7]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2328 h->left_border[17+9]= h->top_border[s->mb_x][24+7]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2329 for(i=1; i<9; i++){ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2330 h->left_border[i+17 ]= src_cb[7+i*uvlinesize]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2331 h->left_border[i+17+9]= src_cr[7+i*uvlinesize]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2332 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2333 *(uint64_t*)(h->top_border[s->mb_x]+16)= *(uint64_t*)(src_cb+8*uvlinesize); |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2334 *(uint64_t*)(h->top_border[s->mb_x]+24)= *(uint64_t*)(src_cr+8*uvlinesize); |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2335 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2336 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2337 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2338 static inline void xchg_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg){ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2339 MpegEncContext * const s = &h->s; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2340 int temp8, i; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2341 uint64_t temp64; |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2342 int deblock_left = (s->mb_x > 0); |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2343 int deblock_top = (s->mb_y > 0); |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2344 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2345 src_y -= linesize + 1; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2346 src_cb -= uvlinesize + 1; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2347 src_cr -= uvlinesize + 1; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2348 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2349 #define XCHG(a,b,t,xchg)\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2350 t= a;\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2351 if(xchg)\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2352 a= b;\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2353 b= t; |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2354 |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2355 if(deblock_left){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2356 for(i = !deblock_top; i<17; i++){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2357 XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg); |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2358 } |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2359 } |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2360 |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2361 if(deblock_top){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2362 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg); |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2363 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2364 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2365 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2366 if(!(s->flags&CODEC_FLAG_GRAY)){ |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2367 if(deblock_left){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2368 for(i = !deblock_top; i<9; i++){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2369 XCHG(h->left_border[i+17 ], src_cb[i*uvlinesize], temp8, xchg); |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2370 XCHG(h->left_border[i+17+9], src_cr[i*uvlinesize], temp8, xchg); |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2371 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2372 } |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2373 if(deblock_top){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2374 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1); |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2375 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1); |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2376 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2377 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2378 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2379 |
1168 | 2380 static void hl_decode_mb(H264Context *h){ |
2381 MpegEncContext * const s = &h->s; | |
2382 const int mb_x= s->mb_x; | |
2383 const int mb_y= s->mb_y; | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2384 const int mb_xy= mb_x + mb_y*s->mb_stride; |
1168 | 2385 const int mb_type= s->current_picture.mb_type[mb_xy]; |
2386 uint8_t *dest_y, *dest_cb, *dest_cr; | |
2387 int linesize, uvlinesize /*dct_offset*/; | |
2388 int i; | |
2389 | |
2390 if(!s->decode) | |
2391 return; | |
2392 | |
2393 if(s->mb_skiped){ | |
2394 } | |
2395 | |
2396 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; | |
2397 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
2398 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
2399 | |
2400 if (h->mb_field_decoding_flag) { | |
2401 linesize = s->linesize * 2; | |
2402 uvlinesize = s->uvlinesize * 2; | |
2403 if(mb_y&1){ //FIXME move out of this func? | |
2404 dest_y -= s->linesize*15; | |
2405 dest_cb-= s->linesize*7; | |
2406 dest_cr-= s->linesize*7; | |
2407 } | |
2408 } else { | |
2409 linesize = s->linesize; | |
2410 uvlinesize = s->uvlinesize; | |
2411 // dct_offset = s->linesize * 16; | |
2412 } | |
2413 | |
2414 if(IS_INTRA(mb_type)){ | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2415 if(h->deblocking_filter) |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2416 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1); |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2417 |
1168 | 2418 if(!(s->flags&CODEC_FLAG_GRAY)){ |
2419 h->pred8x8[ h->chroma_pred_mode ](dest_cb, uvlinesize); | |
2420 h->pred8x8[ h->chroma_pred_mode ](dest_cr, uvlinesize); | |
2421 } | |
2422 | |
2423 if(IS_INTRA4x4(mb_type)){ | |
2424 if(!s->encoding){ | |
2425 for(i=0; i<16; i++){ | |
2426 uint8_t * const ptr= dest_y + h->block_offset[i]; | |
2427 uint8_t *topright= ptr + 4 - linesize; | |
2428 const int topright_avail= (h->topright_samples_available<<i)&0x8000; | |
2429 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ]; | |
2430 int tr; | |
2431 | |
2432 if(!topright_avail){ | |
2433 tr= ptr[3 - linesize]*0x01010101; | |
2434 topright= (uint8_t*) &tr; | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2435 }else if(i==5 && h->deblocking_filter){ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2436 tr= *(uint32_t*)h->top_border[mb_x+1]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2437 topright= (uint8_t*) &tr; |
1168 | 2438 } |
2439 | |
2440 h->pred4x4[ dir ](ptr, topright, linesize); | |
1234 | 2441 if(h->non_zero_count_cache[ scan8[i] ]){ |
2442 if(s->codec_id == CODEC_ID_H264) | |
2443 h264_add_idct_c(ptr, h->mb + i*16, linesize); | |
2444 else | |
2445 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0); | |
2446 } | |
1168 | 2447 } |
2448 } | |
2449 }else{ | |
2450 h->pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize); | |
1234 | 2451 if(s->codec_id == CODEC_ID_H264) |
2452 h264_luma_dc_dequant_idct_c(h->mb, s->qscale); | |
2453 else | |
2454 svq3_luma_dc_dequant_idct_c(h->mb, s->qscale); | |
1168 | 2455 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2456 if(h->deblocking_filter) |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2457 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0); |
1234 | 2458 }else if(s->codec_id == CODEC_ID_H264){ |
1168 | 2459 hl_motion(h, dest_y, dest_cb, dest_cr, |
2460 s->dsp.put_h264_qpel_pixels_tab, s->dsp.put_h264_chroma_pixels_tab, | |
2461 s->dsp.avg_h264_qpel_pixels_tab, s->dsp.avg_h264_chroma_pixels_tab); | |
2462 } | |
2463 | |
2464 | |
2465 if(!IS_INTRA4x4(mb_type)){ | |
1250 | 2466 if(s->codec_id == CODEC_ID_H264){ |
2467 for(i=0; i<16; i++){ | |
2468 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below | |
2469 uint8_t * const ptr= dest_y + h->block_offset[i]; | |
1234 | 2470 h264_add_idct_c(ptr, h->mb + i*16, linesize); |
1250 | 2471 } |
2472 } | |
2473 }else{ | |
2474 for(i=0; i<16; i++){ | |
2475 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below | |
2476 uint8_t * const ptr= dest_y + h->block_offset[i]; | |
1234 | 2477 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); |
1250 | 2478 } |
1168 | 2479 } |
2480 } | |
2481 } | |
2482 | |
2483 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
2484 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp); | |
2485 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp); | |
1250 | 2486 if(s->codec_id == CODEC_ID_H264){ |
2487 for(i=16; i<16+4; i++){ | |
2488 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ | |
2489 uint8_t * const ptr= dest_cb + h->block_offset[i]; | |
1234 | 2490 h264_add_idct_c(ptr, h->mb + i*16, uvlinesize); |
1250 | 2491 } |
2492 } | |
2493 for(i=20; i<20+4; i++){ | |
2494 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ | |
2495 uint8_t * const ptr= dest_cr + h->block_offset[i]; | |
2496 h264_add_idct_c(ptr, h->mb + i*16, uvlinesize); | |
2497 } | |
1168 | 2498 } |
1250 | 2499 }else{ |
2500 for(i=16; i<16+4; i++){ | |
2501 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ | |
2502 uint8_t * const ptr= dest_cb + h->block_offset[i]; | |
1234 | 2503 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2); |
1250 | 2504 } |
2505 } | |
2506 for(i=20; i<20+4; i++){ | |
2507 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ | |
2508 uint8_t * const ptr= dest_cr + h->block_offset[i]; | |
2509 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2); | |
2510 } | |
1168 | 2511 } |
2512 } | |
2513 } | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2514 if(h->deblocking_filter) { |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2515 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize); |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2516 filter_mb(h, mb_x, mb_y, dest_y, dest_cb, dest_cr); |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2517 } |
1168 | 2518 } |
2519 | |
2520 /** | |
2521 * fills the default_ref_list. | |
2522 */ | |
2523 static int fill_default_ref_list(H264Context *h){ | |
2524 MpegEncContext * const s = &h->s; | |
2525 int i; | |
2526 Picture sorted_short_ref[16]; | |
2527 | |
2528 if(h->slice_type==B_TYPE){ | |
2529 int out_i; | |
2530 int limit= -1; | |
2531 | |
2532 for(out_i=0; out_i<h->short_ref_count; out_i++){ | |
2533 int best_i=-1; | |
2255
507690ff49a2
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2254
diff
changeset
|
2534 int best_poc=INT_MAX; |
1168 | 2535 |
2536 for(i=0; i<h->short_ref_count; i++){ | |
2537 const int poc= h->short_ref[i]->poc; | |
2538 if(poc > limit && poc < best_poc){ | |
2539 best_poc= poc; | |
2540 best_i= i; | |
2541 } | |
2542 } | |
2543 | |
2544 assert(best_i != -1); | |
2545 | |
2546 limit= best_poc; | |
2547 sorted_short_ref[out_i]= *h->short_ref[best_i]; | |
2548 } | |
2549 } | |
2550 | |
2551 if(s->picture_structure == PICT_FRAME){ | |
2552 if(h->slice_type==B_TYPE){ | |
2553 const int current_poc= s->current_picture_ptr->poc; | |
2554 int list; | |
2555 | |
2556 for(list=0; list<2; list++){ | |
2557 int index=0; | |
2558 | |
2559 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++){ | |
2560 const int i2= list ? h->short_ref_count - i - 1 : i; | |
2561 const int poc= sorted_short_ref[i2].poc; | |
2562 | |
2563 if(sorted_short_ref[i2].reference != 3) continue; //FIXME refernce field shit | |
2564 | |
2565 if((list==1 && poc > current_poc) || (list==0 && poc < current_poc)){ | |
2566 h->default_ref_list[list][index ]= sorted_short_ref[i2]; | |
2567 h->default_ref_list[list][index++].pic_id= sorted_short_ref[i2].frame_num; | |
2568 } | |
2569 } | |
2570 | |
2571 for(i=0; i<h->long_ref_count && index < h->ref_count[ list ]; i++){ | |
2572 if(h->long_ref[i]->reference != 3) continue; | |
2573 | |
2574 h->default_ref_list[ list ][index ]= *h->long_ref[i]; | |
2575 h->default_ref_list[ list ][index++].pic_id= i;; | |
2576 } | |
2577 | |
2578 if(h->long_ref_count > 1 && h->short_ref_count==0){ | |
2579 Picture temp= h->default_ref_list[1][0]; | |
2580 h->default_ref_list[1][0] = h->default_ref_list[1][1]; | |
2581 h->default_ref_list[1][0] = temp; | |
2582 } | |
2583 | |
2584 if(index < h->ref_count[ list ]) | |
2585 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index)); | |
2586 } | |
2587 }else{ | |
2588 int index=0; | |
2589 for(i=0; i<h->short_ref_count && index < h->ref_count[0]; i++){ | |
2590 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit | |
2591 h->default_ref_list[0][index ]= *h->short_ref[i]; | |
2592 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num; | |
2593 } | |
2594 for(i=0; i<h->long_ref_count && index < h->ref_count[0]; i++){ | |
2595 if(h->long_ref[i]->reference != 3) continue; | |
2596 h->default_ref_list[0][index ]= *h->long_ref[i]; | |
2597 h->default_ref_list[0][index++].pic_id= i;; | |
2598 } | |
2599 if(index < h->ref_count[0]) | |
2600 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index)); | |
2601 } | |
2602 }else{ //FIELD | |
2603 if(h->slice_type==B_TYPE){ | |
2604 }else{ | |
2605 //FIXME second field balh | |
2606 } | |
2607 } | |
2608 return 0; | |
2609 } | |
2610 | |
2611 static int decode_ref_pic_list_reordering(H264Context *h){ | |
2612 MpegEncContext * const s = &h->s; | |
2613 int list; | |
2614 | |
2615 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move beofre func | |
2616 | |
2617 for(list=0; list<2; list++){ | |
2618 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]); | |
2619 | |
2620 if(get_bits1(&s->gb)){ | |
2621 int pred= h->curr_pic_num; | |
2622 int index; | |
2623 | |
2624 for(index=0; ; index++){ | |
2625 int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb); | |
2626 int pic_id; | |
2627 int i; | |
2628 | |
2629 | |
2630 if(index >= h->ref_count[list]){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2631 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n"); |
1168 | 2632 return -1; |
2633 } | |
2634 | |
2635 if(reordering_of_pic_nums_idc<3){ | |
2636 if(reordering_of_pic_nums_idc<2){ | |
2637 const int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1; | |
2638 | |
2639 if(abs_diff_pic_num >= h->max_pic_num){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2640 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n"); |
1168 | 2641 return -1; |
2642 } | |
2643 | |
2644 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num; | |
2645 else pred+= abs_diff_pic_num; | |
2646 pred &= h->max_pic_num - 1; | |
2647 | |
2648 for(i= h->ref_count[list]-1; i>=index; i--){ | |
2649 if(h->ref_list[list][i].pic_id == pred && h->ref_list[list][i].long_ref==0) | |
2650 break; | |
2651 } | |
2652 }else{ | |
2653 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx | |
2654 | |
2655 for(i= h->ref_count[list]-1; i>=index; i--){ | |
2656 if(h->ref_list[list][i].pic_id == pic_id && h->ref_list[list][i].long_ref==1) | |
2657 break; | |
2658 } | |
2659 } | |
2660 | |
2661 if(i < index){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2662 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n"); |
1168 | 2663 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME |
2664 }else if(i > index){ | |
2665 Picture tmp= h->ref_list[list][i]; | |
2666 for(; i>index; i--){ | |
2667 h->ref_list[list][i]= h->ref_list[list][i-1]; | |
2668 } | |
2669 h->ref_list[list][index]= tmp; | |
2670 } | |
2671 }else if(reordering_of_pic_nums_idc==3) | |
2672 break; | |
2673 else{ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2674 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n"); |
1168 | 2675 return -1; |
2676 } | |
2677 } | |
2678 } | |
2679 | |
2680 if(h->slice_type!=B_TYPE) break; | |
2681 } | |
2682 return 0; | |
2683 } | |
2684 | |
2685 static int pred_weight_table(H264Context *h){ | |
2686 MpegEncContext * const s = &h->s; | |
2687 int list, i; | |
2688 | |
2689 h->luma_log2_weight_denom= get_ue_golomb(&s->gb); | |
2690 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb); | |
2691 | |
2692 for(list=0; list<2; list++){ | |
2693 for(i=0; i<h->ref_count[list]; i++){ | |
2694 int luma_weight_flag, chroma_weight_flag; | |
2695 | |
2696 luma_weight_flag= get_bits1(&s->gb); | |
2697 if(luma_weight_flag){ | |
2698 h->luma_weight[list][i]= get_se_golomb(&s->gb); | |
2699 h->luma_offset[list][i]= get_se_golomb(&s->gb); | |
2700 } | |
2701 | |
2702 chroma_weight_flag= get_bits1(&s->gb); | |
2703 if(chroma_weight_flag){ | |
2704 int j; | |
2705 for(j=0; j<2; j++){ | |
2706 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb); | |
2707 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb); | |
2708 } | |
2709 } | |
2710 } | |
2711 if(h->slice_type != B_TYPE) break; | |
2712 } | |
2713 return 0; | |
2714 } | |
2715 | |
2716 /** | |
2717 * instantaneos decoder refresh. | |
2718 */ | |
2719 static void idr(H264Context *h){ | |
2720 int i; | |
2721 | |
2722 for(i=0; i<h->long_ref_count; i++){ | |
2723 h->long_ref[i]->reference=0; | |
2724 h->long_ref[i]= NULL; | |
2725 } | |
2726 h->long_ref_count=0; | |
2727 | |
2728 for(i=0; i<h->short_ref_count; i++){ | |
2729 h->short_ref[i]->reference=0; | |
2730 h->short_ref[i]= NULL; | |
2731 } | |
2732 h->short_ref_count=0; | |
2733 } | |
2734 | |
2735 /** | |
2736 * | |
2737 * @return the removed picture or NULL if an error occures | |
2738 */ | |
2739 static Picture * remove_short(H264Context *h, int frame_num){ | |
1169 | 2740 MpegEncContext * const s = &h->s; |
1168 | 2741 int i; |
2742 | |
1169 | 2743 if(s->avctx->debug&FF_DEBUG_MMCO) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2744 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count); |
1169 | 2745 |
1168 | 2746 for(i=0; i<h->short_ref_count; i++){ |
2747 Picture *pic= h->short_ref[i]; | |
1169 | 2748 if(s->avctx->debug&FF_DEBUG_MMCO) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2749 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic); |
1168 | 2750 if(pic->frame_num == frame_num){ |
2751 h->short_ref[i]= NULL; | |
2752 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*)); | |
2753 h->short_ref_count--; | |
2754 return pic; | |
2755 } | |
2756 } | |
2757 return NULL; | |
2758 } | |
2759 | |
2760 /** | |
2761 * | |
2762 * @return the removed picture or NULL if an error occures | |
2763 */ | |
2764 static Picture * remove_long(H264Context *h, int i){ | |
2765 Picture *pic; | |
2766 | |
2767 if(i >= h->long_ref_count) return NULL; | |
2768 pic= h->long_ref[i]; | |
2769 if(pic==NULL) return NULL; | |
2770 | |
2771 h->long_ref[i]= NULL; | |
2772 memmove(&h->long_ref[i], &h->long_ref[i+1], (h->long_ref_count - i - 1)*sizeof(Picture*)); | |
2773 h->long_ref_count--; | |
2774 | |
2775 return pic; | |
2776 } | |
2777 | |
2778 /** | |
2779 * Executes the reference picture marking (memory management control operations). | |
2780 */ | |
2781 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ | |
2782 MpegEncContext * const s = &h->s; | |
2783 int i; | |
2784 int current_is_long=0; | |
2785 Picture *pic; | |
2786 | |
2787 if((s->avctx->debug&FF_DEBUG_MMCO) && mmco_count==0) | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2788 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n"); |
1168 | 2789 |
2790 for(i=0; i<mmco_count; i++){ | |
2791 if(s->avctx->debug&FF_DEBUG_MMCO) | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2792 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco:%d %d %d\n", h->mmco[i].opcode, h->mmco[i].short_frame_num, h->mmco[i].long_index); |
1168 | 2793 |
2794 switch(mmco[i].opcode){ | |
2795 case MMCO_SHORT2UNUSED: | |
2796 pic= remove_short(h, mmco[i].short_frame_num); | |
2797 if(pic==NULL) return -1; | |
2798 pic->reference= 0; | |
2799 break; | |
2800 case MMCO_SHORT2LONG: | |
2801 pic= remove_long(h, mmco[i].long_index); | |
2802 if(pic) pic->reference=0; | |
2803 | |
2804 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num); | |
2805 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
2806 break; | |
2807 case MMCO_LONG2UNUSED: | |
2808 pic= remove_long(h, mmco[i].long_index); | |
2809 if(pic==NULL) return -1; | |
2810 pic->reference= 0; | |
2811 break; | |
2812 case MMCO_LONG: | |
2813 pic= remove_long(h, mmco[i].long_index); | |
2814 if(pic) pic->reference=0; | |
2815 | |
2816 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr; | |
2817 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
2818 h->long_ref_count++; | |
2819 | |
2820 current_is_long=1; | |
2821 break; | |
2822 case MMCO_SET_MAX_LONG: | |
2823 assert(mmco[i].long_index <= 16); | |
2824 while(mmco[i].long_index < h->long_ref_count){ | |
2825 pic= remove_long(h, mmco[i].long_index); | |
2826 pic->reference=0; | |
2827 } | |
2828 while(mmco[i].long_index > h->long_ref_count){ | |
2829 h->long_ref[ h->long_ref_count++ ]= NULL; | |
2830 } | |
2831 break; | |
2832 case MMCO_RESET: | |
2833 while(h->short_ref_count){ | |
2834 pic= remove_short(h, h->short_ref[0]->frame_num); | |
2835 pic->reference=0; | |
2836 } | |
2837 while(h->long_ref_count){ | |
2838 pic= remove_long(h, h->long_ref_count-1); | |
2839 pic->reference=0; | |
2840 } | |
2841 break; | |
2842 default: assert(0); | |
2843 } | |
2844 } | |
2845 | |
2846 if(!current_is_long){ | |
2847 pic= remove_short(h, s->current_picture_ptr->frame_num); | |
2848 if(pic){ | |
2849 pic->reference=0; | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2850 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n"); |
1168 | 2851 } |
2852 | |
2853 if(h->short_ref_count) | |
1169 | 2854 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*)); |
2855 | |
2856 h->short_ref[0]= s->current_picture_ptr; | |
1168 | 2857 h->short_ref[0]->long_ref=0; |
2858 h->short_ref_count++; | |
2859 } | |
2860 | |
2861 return 0; | |
2862 } | |
2863 | |
2864 static int decode_ref_pic_marking(H264Context *h){ | |
2865 MpegEncContext * const s = &h->s; | |
2866 int i; | |
2867 | |
2868 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields | |
2869 s->broken_link= get_bits1(&s->gb) -1; | |
2870 h->mmco[0].long_index= get_bits1(&s->gb) - 1; // current_long_term_idx | |
2871 if(h->mmco[0].long_index == -1) | |
2872 h->mmco_index= 0; | |
2873 else{ | |
2874 h->mmco[0].opcode= MMCO_LONG; | |
2875 h->mmco_index= 1; | |
2876 } | |
2877 }else{ | |
2878 if(get_bits1(&s->gb)){ // adaptive_ref_pic_marking_mode_flag | |
2879 for(i= h->mmco_index; i<MAX_MMCO_COUNT; i++) { | |
2880 MMCOOpcode opcode= get_ue_golomb(&s->gb);; | |
2881 | |
2882 h->mmco[i].opcode= opcode; | |
2883 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){ | |
2884 h->mmco[i].short_frame_num= (h->frame_num - get_ue_golomb(&s->gb) - 1) & ((1<<h->sps.log2_max_frame_num)-1); //FIXME fields | |
2885 /* if(h->mmco[i].short_frame_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_frame_num ] == NULL){ | |
2886 fprintf(stderr, "illegal short ref in memory management control operation %d\n", mmco); | |
2887 return -1; | |
2888 }*/ | |
2889 } | |
2890 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){ | |
2891 h->mmco[i].long_index= get_ue_golomb(&s->gb); | |
2892 if(/*h->mmco[i].long_index >= h->long_ref_count || h->long_ref[ h->mmco[i].long_index ] == NULL*/ h->mmco[i].long_index >= 16){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2893 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); |
1168 | 2894 return -1; |
2895 } | |
2896 } | |
2897 | |
2898 if(opcode > MMCO_LONG){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2899 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); |
1168 | 2900 return -1; |
2901 } | |
2255
507690ff49a2
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2254
diff
changeset
|
2902 if(opcode == MMCO_END) |
507690ff49a2
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2254
diff
changeset
|
2903 break; |
1168 | 2904 } |
2905 h->mmco_index= i; | |
2906 }else{ | |
2907 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count); | |
2908 | |
2909 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields | |
2910 h->mmco[0].opcode= MMCO_SHORT2UNUSED; | |
2911 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num; | |
2912 h->mmco_index= 1; | |
2913 }else | |
2914 h->mmco_index= 0; | |
2915 } | |
2916 } | |
2917 | |
2918 return 0; | |
2919 } | |
2920 | |
2921 static int init_poc(H264Context *h){ | |
2922 MpegEncContext * const s = &h->s; | |
2923 const int max_frame_num= 1<<h->sps.log2_max_frame_num; | |
2924 int field_poc[2]; | |
2925 | |
2926 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
2927 h->frame_num_offset= 0; | |
2928 }else{ | |
2929 if(h->frame_num < h->prev_frame_num) | |
2930 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num; | |
2931 else | |
2932 h->frame_num_offset= h->prev_frame_num_offset; | |
2933 } | |
2934 | |
2935 if(h->sps.poc_type==0){ | |
2936 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb; | |
2937 | |
2938 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2) | |
2939 h->poc_msb = h->prev_poc_msb + max_poc_lsb; | |
2940 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2) | |
2941 h->poc_msb = h->prev_poc_msb - max_poc_lsb; | |
2942 else | |
2943 h->poc_msb = h->prev_poc_msb; | |
2944 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb); | |
2945 field_poc[0] = | |
2946 field_poc[1] = h->poc_msb + h->poc_lsb; | |
2947 if(s->picture_structure == PICT_FRAME) | |
2948 field_poc[1] += h->delta_poc_bottom; | |
2949 }else if(h->sps.poc_type==1){ | |
2950 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc; | |
2951 int i; | |
2952 | |
2953 if(h->sps.poc_cycle_length != 0) | |
2954 abs_frame_num = h->frame_num_offset + h->frame_num; | |
2955 else | |
2956 abs_frame_num = 0; | |
2957 | |
2958 if(h->nal_ref_idc==0 && abs_frame_num > 0) | |
2959 abs_frame_num--; | |
2960 | |
2961 expected_delta_per_poc_cycle = 0; | |
2962 for(i=0; i < h->sps.poc_cycle_length; i++) | |
2963 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse | |
2964 | |
2965 if(abs_frame_num > 0){ | |
2966 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length; | |
2967 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length; | |
2968 | |
2969 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle; | |
2970 for(i = 0; i <= frame_num_in_poc_cycle; i++) | |
2971 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ]; | |
2972 } else | |
2973 expectedpoc = 0; | |
2974 | |
2975 if(h->nal_ref_idc == 0) | |
2976 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic; | |
2977 | |
2978 field_poc[0] = expectedpoc + h->delta_poc[0]; | |
2979 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field; | |
2980 | |
2981 if(s->picture_structure == PICT_FRAME) | |
2982 field_poc[1] += h->delta_poc[1]; | |
2983 }else{ | |
2984 int poc; | |
2985 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
2986 poc= 0; | |
2987 }else{ | |
2988 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num); | |
2989 else poc= 2*(h->frame_num_offset + h->frame_num) - 1; | |
2990 } | |
2991 field_poc[0]= poc; | |
2992 field_poc[1]= poc; | |
2993 } | |
2994 | |
2995 if(s->picture_structure != PICT_BOTTOM_FIELD) | |
2996 s->current_picture_ptr->field_poc[0]= field_poc[0]; | |
2997 if(s->picture_structure != PICT_TOP_FIELD) | |
2998 s->current_picture_ptr->field_poc[1]= field_poc[1]; | |
2999 if(s->picture_structure == PICT_FRAME) // FIXME field pix? | |
3000 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]); | |
3001 | |
3002 return 0; | |
3003 } | |
3004 | |
3005 /** | |
3006 * decodes a slice header. | |
3007 * this will allso call MPV_common_init() and frame_start() as needed | |
3008 */ | |
3009 static int decode_slice_header(H264Context *h){ | |
3010 MpegEncContext * const s = &h->s; | |
3011 int first_mb_in_slice, pps_id; | |
3012 int num_ref_idx_active_override_flag; | |
3013 static const uint8_t slice_type_map[5]= {P_TYPE, B_TYPE, I_TYPE, SP_TYPE, SI_TYPE}; | |
3014 | |
3015 s->current_picture.reference= h->nal_ref_idc != 0; | |
3016 | |
3017 first_mb_in_slice= get_ue_golomb(&s->gb); | |
3018 | |
3019 h->slice_type= get_ue_golomb(&s->gb); | |
3020 if(h->slice_type > 9){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3021 av_log(h->s.avctx, AV_LOG_ERROR, "slice type too large (%d) at %d %d\n", h->slice_type, s->mb_x, s->mb_y); |
1168 | 3022 } |
3023 if(h->slice_type > 4){ | |
3024 h->slice_type -= 5; | |
3025 h->slice_type_fixed=1; | |
3026 }else | |
3027 h->slice_type_fixed=0; | |
3028 | |
3029 h->slice_type= slice_type_map[ h->slice_type ]; | |
3030 | |
3031 s->pict_type= h->slice_type; // to make a few old func happy, its wrong though | |
3032 | |
3033 pps_id= get_ue_golomb(&s->gb); | |
3034 if(pps_id>255){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3035 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n"); |
1168 | 3036 return -1; |
3037 } | |
3038 h->pps= h->pps_buffer[pps_id]; | |
1174 | 3039 if(h->pps.slice_group_count == 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3040 av_log(h->s.avctx, AV_LOG_ERROR, "non existing PPS referenced\n"); |
1174 | 3041 return -1; |
3042 } | |
3043 | |
1168 | 3044 h->sps= h->sps_buffer[ h->pps.sps_id ]; |
1174 | 3045 if(h->sps.log2_max_frame_num == 0){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3046 av_log(h->s.avctx, AV_LOG_ERROR, "non existing SPS referenced\n"); |
1174 | 3047 return -1; |
3048 } | |
1168 | 3049 |
3050 s->mb_width= h->sps.mb_width; | |
3051 s->mb_height= h->sps.mb_height; | |
3052 | |
3053 h->b_stride= s->mb_width*4; | |
3054 h->b8_stride= s->mb_width*2; | |
3055 | |
3056 s->mb_x = first_mb_in_slice % s->mb_width; | |
3057 s->mb_y = first_mb_in_slice / s->mb_width; //FIXME AFFW | |
3058 | |
1371 | 3059 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right ); |
1168 | 3060 if(h->sps.frame_mbs_only_flag) |
1371 | 3061 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom); |
1168 | 3062 else |
1371 | 3063 s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck |
1168 | 3064 |
3065 if (s->context_initialized | |
1548 | 3066 && ( s->width != s->avctx->width || s->height != s->avctx->height)) { |
1168 | 3067 free_tables(h); |
3068 MPV_common_end(s); | |
3069 } | |
3070 if (!s->context_initialized) { | |
3071 if (MPV_common_init(s) < 0) | |
3072 return -1; | |
3073 | |
3074 alloc_tables(h); | |
3075 | |
3076 s->avctx->width = s->width; | |
3077 s->avctx->height = s->height; | |
1548 | 3078 s->avctx->sample_aspect_ratio= h->sps.sar; |
2174
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
3079 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
3080 if(h->sps.timing_info_present_flag && h->sps.fixed_frame_rate_flag){ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
3081 s->avctx->frame_rate = h->sps.time_scale; |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
3082 s->avctx->frame_rate_base = h->sps.num_units_in_tick; |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
3083 } |
1168 | 3084 } |
3085 | |
3086 if(first_mb_in_slice == 0){ | |
3087 frame_start(h); | |
3088 } | |
3089 | |
1169 | 3090 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup |
1168 | 3091 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num); |
3092 | |
3093 if(h->sps.frame_mbs_only_flag){ | |
3094 s->picture_structure= PICT_FRAME; | |
3095 }else{ | |
3096 if(get_bits1(&s->gb)) //field_pic_flag | |
3097 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag | |
3098 else | |
3099 s->picture_structure= PICT_FRAME; | |
3100 } | |
3101 | |
3102 if(s->picture_structure==PICT_FRAME){ | |
3103 h->curr_pic_num= h->frame_num; | |
3104 h->max_pic_num= 1<< h->sps.log2_max_frame_num; | |
3105 }else{ | |
3106 h->curr_pic_num= 2*h->frame_num; | |
3107 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); | |
3108 } | |
3109 | |
3110 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
1453 | 3111 get_ue_golomb(&s->gb); /* idr_pic_id */ |
1168 | 3112 } |
3113 | |
3114 if(h->sps.poc_type==0){ | |
3115 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb); | |
3116 | |
3117 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){ | |
3118 h->delta_poc_bottom= get_se_golomb(&s->gb); | |
3119 } | |
3120 } | |
3121 | |
3122 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){ | |
3123 h->delta_poc[0]= get_se_golomb(&s->gb); | |
3124 | |
3125 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME) | |
3126 h->delta_poc[1]= get_se_golomb(&s->gb); | |
3127 } | |
3128 | |
3129 init_poc(h); | |
3130 | |
3131 if(h->pps.redundant_pic_cnt_present){ | |
3132 h->redundant_pic_count= get_ue_golomb(&s->gb); | |
3133 } | |
3134 | |
3135 //set defaults, might be overriden a few line later | |
3136 h->ref_count[0]= h->pps.ref_count[0]; | |
3137 h->ref_count[1]= h->pps.ref_count[1]; | |
3138 | |
3139 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){ | |
3140 if(h->slice_type == B_TYPE){ | |
3141 h->direct_spatial_mv_pred= get_bits1(&s->gb); | |
3142 } | |
3143 num_ref_idx_active_override_flag= get_bits1(&s->gb); | |
3144 | |
3145 if(num_ref_idx_active_override_flag){ | |
3146 h->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
3147 if(h->slice_type==B_TYPE) | |
3148 h->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
3149 | |
3150 if(h->ref_count[0] > 32 || h->ref_count[1] > 32){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3151 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n"); |
1168 | 3152 return -1; |
3153 } | |
3154 } | |
3155 } | |
3156 | |
3157 if(first_mb_in_slice == 0){ | |
3158 fill_default_ref_list(h); | |
3159 } | |
3160 | |
3161 decode_ref_pic_list_reordering(h); | |
3162 | |
3163 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE )) | |
3164 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) ) | |
3165 pred_weight_table(h); | |
3166 | |
3167 if(s->current_picture.reference) | |
3168 decode_ref_pic_marking(h); | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3169 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3170 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE && h->pps.cabac ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3171 h->cabac_init_idc = get_ue_golomb(&s->gb); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3172 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3173 h->last_qscale_diff = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3174 s->qscale = h->pps.init_qp + get_se_golomb(&s->gb); |
1898 | 3175 if(s->qscale<0 || s->qscale>51){ |
3176 av_log(s->avctx, AV_LOG_ERROR, "QP %d out of range\n", s->qscale); | |
3177 return -1; | |
3178 } | |
1168 | 3179 //FIXME qscale / qp ... stuff |
3180 if(h->slice_type == SP_TYPE){ | |
1453 | 3181 get_bits1(&s->gb); /* sp_for_switch_flag */ |
1168 | 3182 } |
3183 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){ | |
1453 | 3184 get_se_golomb(&s->gb); /* slice_qs_delta */ |
1168 | 3185 } |
3186 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3187 h->deblocking_filter = 1; |
1898 | 3188 h->slice_alpha_c0_offset = 0; |
3189 h->slice_beta_offset = 0; | |
1168 | 3190 if( h->pps.deblocking_filter_parameters_present ) { |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3191 h->deblocking_filter= get_ue_golomb(&s->gb); |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3192 if(h->deblocking_filter < 2) |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3193 h->deblocking_filter^= 1; // 1<->0 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3194 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3195 if( h->deblocking_filter ) { |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
3196 h->slice_alpha_c0_offset = get_se_golomb(&s->gb) << 1; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
3197 h->slice_beta_offset = get_se_golomb(&s->gb) << 1; |
1168 | 3198 } |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
3199 } |
1168 | 3200 |
3201 #if 0 //FMO | |
3202 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5) | |
3203 slice_group_change_cycle= get_bits(&s->gb, ?); | |
3204 #endif | |
3205 | |
3206 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3207 av_log(h->s.avctx, AV_LOG_DEBUG, "mb:%d %c pps:%d frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d\n", |
1168 | 3208 first_mb_in_slice, |
1264 | 3209 av_get_pict_type_char(h->slice_type), |
1168 | 3210 pps_id, h->frame_num, |
3211 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], | |
3212 h->ref_count[0], h->ref_count[1], | |
3213 s->qscale, | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3214 h->deblocking_filter |
1168 | 3215 ); |
3216 } | |
3217 | |
3218 return 0; | |
3219 } | |
3220 | |
3221 /** | |
3222 * | |
3223 */ | |
3224 static inline int get_level_prefix(GetBitContext *gb){ | |
3225 unsigned int buf; | |
3226 int log; | |
3227 | |
3228 OPEN_READER(re, gb); | |
3229 UPDATE_CACHE(re, gb); | |
3230 buf=GET_CACHE(re, gb); | |
3231 | |
3232 log= 32 - av_log2(buf); | |
3233 #ifdef TRACE | |
3234 print_bin(buf>>(32-log), log); | |
3235 printf("%5d %2d %3d lpr @%5d in %s get_level_prefix\n", buf>>(32-log), log, log-1, get_bits_count(gb), __FILE__); | |
3236 #endif | |
3237 | |
3238 LAST_SKIP_BITS(re, gb, log); | |
3239 CLOSE_READER(re, gb); | |
3240 | |
3241 return log-1; | |
3242 } | |
3243 | |
3244 /** | |
3245 * decodes a residual block. | |
3246 * @param n block index | |
3247 * @param scantable scantable | |
3248 * @param max_coeff number of coefficients in the block | |
3249 * @return <0 if an error occured | |
3250 */ | |
3251 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, int qp, int max_coeff){ | |
3252 MpegEncContext * const s = &h->s; | |
3253 const uint16_t *qmul= dequant_coeff[qp]; | |
3254 static const int coeff_token_table_index[17]= {0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3}; | |
3255 int level[16], run[16]; | |
3256 int suffix_length, zeros_left, coeff_num, coeff_token, total_coeff, i, trailing_ones; | |
3257 | |
3258 //FIXME put trailing_onex into the context | |
3259 | |
3260 if(n == CHROMA_DC_BLOCK_INDEX){ | |
3261 coeff_token= get_vlc2(gb, chroma_dc_coeff_token_vlc.table, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 1); | |
3262 total_coeff= coeff_token>>2; | |
3263 }else{ | |
3264 if(n == LUMA_DC_BLOCK_INDEX){ | |
3265 total_coeff= pred_non_zero_count(h, 0); | |
3266 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
3267 total_coeff= coeff_token>>2; | |
3268 }else{ | |
3269 total_coeff= pred_non_zero_count(h, n); | |
3270 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
3271 total_coeff= coeff_token>>2; | |
3272 h->non_zero_count_cache[ scan8[n] ]= total_coeff; | |
3273 } | |
3274 } | |
3275 | |
3276 //FIXME set last_non_zero? | |
3277 | |
3278 if(total_coeff==0) | |
3279 return 0; | |
3280 | |
3281 trailing_ones= coeff_token&3; | |
1170 | 3282 tprintf("trailing:%d, total:%d\n", trailing_ones, total_coeff); |
1168 | 3283 assert(total_coeff<=16); |
3284 | |
3285 for(i=0; i<trailing_ones; i++){ | |
3286 level[i]= 1 - 2*get_bits1(gb); | |
3287 } | |
3288 | |
3289 suffix_length= total_coeff > 10 && trailing_ones < 3; | |
3290 | |
3291 for(; i<total_coeff; i++){ | |
3292 const int prefix= get_level_prefix(gb); | |
3293 int level_code, mask; | |
3294 | |
3295 if(prefix<14){ //FIXME try to build a large unified VLC table for all this | |
3296 if(suffix_length) | |
3297 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
3298 else | |
3299 level_code= (prefix<<suffix_length); //part | |
3300 }else if(prefix==14){ | |
3301 if(suffix_length) | |
3302 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
3303 else | |
3304 level_code= prefix + get_bits(gb, 4); //part | |
3305 }else if(prefix==15){ | |
3306 level_code= (prefix<<suffix_length) + get_bits(gb, 12); //part | |
3307 if(suffix_length==0) level_code+=15; //FIXME doesnt make (much)sense | |
3308 }else{ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3309 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); |
1168 | 3310 return -1; |
3311 } | |
3312 | |
3313 if(i==trailing_ones && i<3) level_code+= 2; //FIXME split first iteration | |
3314 | |
3315 mask= -(level_code&1); | |
3316 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
3317 | |
3318 if(suffix_length==0) suffix_length=1; //FIXME split first iteration | |
3319 | |
3320 #if 1 | |
3321 if(ABS(level[i]) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++; | |
3322 #else | |
3323 if((2+level_code)>>1) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++; | |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
3324 /* ? == prefix > 2 or sth */ |
1168 | 3325 #endif |
1170 | 3326 tprintf("level: %d suffix_length:%d\n", level[i], suffix_length); |
1168 | 3327 } |
3328 | |
3329 if(total_coeff == max_coeff) | |
3330 zeros_left=0; | |
3331 else{ | |
3332 if(n == CHROMA_DC_BLOCK_INDEX) | |
3333 zeros_left= get_vlc2(gb, chroma_dc_total_zeros_vlc[ total_coeff-1 ].table, CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 1); | |
3334 else | |
3335 zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1); | |
3336 } | |
3337 | |
3338 for(i=0; i<total_coeff-1; i++){ | |
3339 if(zeros_left <=0) | |
3340 break; | |
3341 else if(zeros_left < 7){ | |
3342 run[i]= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
3343 }else{ | |
3344 run[i]= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
3345 } | |
3346 zeros_left -= run[i]; | |
3347 } | |
3348 | |
3349 if(zeros_left<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3350 av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y); |
1168 | 3351 return -1; |
3352 } | |
3353 | |
3354 for(; i<total_coeff-1; i++){ | |
3355 run[i]= 0; | |
3356 } | |
3357 | |
3358 run[i]= zeros_left; | |
3359 | |
3360 coeff_num=-1; | |
3361 if(n > 24){ | |
3362 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
3363 int j; | |
3364 | |
3365 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
3366 j= scantable[ coeff_num ]; | |
3367 | |
3368 block[j]= level[i]; | |
3369 } | |
3370 }else{ | |
3371 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
3372 int j; | |
3373 | |
3374 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
3375 j= scantable[ coeff_num ]; | |
3376 | |
3377 block[j]= level[i] * qmul[j]; | |
3378 // printf("%d %d ", block[j], qmul[j]); | |
3379 } | |
3380 } | |
3381 return 0; | |
3382 } | |
3383 | |
3384 /** | |
3385 * decodes a macroblock | |
3386 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed | |
3387 */ | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3388 static int decode_mb_cavlc(H264Context *h){ |
1168 | 3389 MpegEncContext * const s = &h->s; |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
3390 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1169 | 3391 int mb_type, partition_count, cbp; |
1168 | 3392 |
1252 | 3393 s->dsp.clear_blocks(h->mb); //FIXME avoid if allready clear (move after skip handlong? |
1168 | 3394 |
1170 | 3395 tprintf("pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
1453 | 3396 cbp = 0; /* avoid warning. FIXME: find a solution without slowing |
3397 down the code */ | |
1168 | 3398 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){ |
3399 if(s->mb_skip_run==-1) | |
3400 s->mb_skip_run= get_ue_golomb(&s->gb); | |
3401 | |
3402 if (s->mb_skip_run--) { | |
1187 | 3403 int mx, my; |
1168 | 3404 /* skip mb */ |
3405 //FIXME b frame | |
3406 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0; | |
3407 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3408 memset(h->non_zero_count[mb_xy], 0, 16); |
1168 | 3409 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui |
3410 | |
3411 if(h->sps.mb_aff && s->mb_skip_run==0 && (s->mb_y&1)==0){ | |
3412 h->mb_field_decoding_flag= get_bits1(&s->gb); | |
3413 } | |
3414 | |
3415 if(h->mb_field_decoding_flag) | |
3416 mb_type|= MB_TYPE_INTERLACED; | |
3417 | |
3418 fill_caches(h, mb_type); //FIXME check what is needed and what not ... | |
3419 pred_pskip_motion(h, &mx, &my); | |
3420 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
1269 | 3421 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); |
1168 | 3422 write_back_motion(h, mb_type); |
3423 | |
3424 s->current_picture.mb_type[mb_xy]= mb_type; //FIXME SKIP type | |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
3425 s->current_picture.qscale_table[mb_xy]= s->qscale; |
1168 | 3426 h->slice_table[ mb_xy ]= h->slice_num; |
3427 | |
3428 h->prev_mb_skiped= 1; | |
3429 return 0; | |
3430 } | |
3431 } | |
3432 if(h->sps.mb_aff /* && !field pic FIXME needed? */){ | |
3433 if((s->mb_y&1)==0) | |
3434 h->mb_field_decoding_flag = get_bits1(&s->gb); | |
3435 }else | |
3436 h->mb_field_decoding_flag=0; //FIXME som ed note ?! | |
3437 | |
3438 h->prev_mb_skiped= 0; | |
3439 | |
3440 mb_type= get_ue_golomb(&s->gb); | |
3441 if(h->slice_type == B_TYPE){ | |
3442 if(mb_type < 23){ | |
3443 partition_count= b_mb_type_info[mb_type].partition_count; | |
3444 mb_type= b_mb_type_info[mb_type].type; | |
3445 }else{ | |
3446 mb_type -= 23; | |
3447 goto decode_intra_mb; | |
3448 } | |
3449 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){ | |
3450 if(mb_type < 5){ | |
3451 partition_count= p_mb_type_info[mb_type].partition_count; | |
3452 mb_type= p_mb_type_info[mb_type].type; | |
3453 }else{ | |
3454 mb_type -= 5; | |
3455 goto decode_intra_mb; | |
3456 } | |
3457 }else{ | |
3458 assert(h->slice_type == I_TYPE); | |
3459 decode_intra_mb: | |
3460 if(mb_type > 25){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3461 av_log(h->s.avctx, AV_LOG_ERROR, "mb_type %d in %c slice to large at %d %d\n", mb_type, av_get_pict_type_char(h->slice_type), s->mb_x, s->mb_y); |
1168 | 3462 return -1; |
3463 } | |
3464 partition_count=0; | |
3465 cbp= i_mb_type_info[mb_type].cbp; | |
3466 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; | |
3467 mb_type= i_mb_type_info[mb_type].type; | |
3468 } | |
3469 | |
3470 if(h->mb_field_decoding_flag) | |
3471 mb_type |= MB_TYPE_INTERLACED; | |
3472 | |
3473 s->current_picture.mb_type[mb_xy]= mb_type; | |
3474 h->slice_table[ mb_xy ]= h->slice_num; | |
3475 | |
3476 if(IS_INTRA_PCM(mb_type)){ | |
3477 const uint8_t *ptr; | |
1187 | 3478 int x, y; |
1168 | 3479 |
3480 // we assume these blocks are very rare so we dont optimize it | |
3481 align_get_bits(&s->gb); | |
3482 | |
3483 ptr= s->gb.buffer + get_bits_count(&s->gb); | |
3484 | |
3485 for(y=0; y<16; y++){ | |
3486 const int index= 4*(y&3) + 64*(y>>2); | |
3487 for(x=0; x<16; x++){ | |
3488 h->mb[index + (x&3) + 16*(x>>2)]= *(ptr++); | |
3489 } | |
3490 } | |
3491 for(y=0; y<8; y++){ | |
3492 const int index= 256 + 4*(y&3) + 32*(y>>2); | |
3493 for(x=0; x<8; x++){ | |
3494 h->mb[index + (x&3) + 16*(x>>2)]= *(ptr++); | |
3495 } | |
3496 } | |
3497 for(y=0; y<8; y++){ | |
3498 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); | |
3499 for(x=0; x<8; x++){ | |
3500 h->mb[index + (x&3) + 16*(x>>2)]= *(ptr++); | |
3501 } | |
3502 } | |
3503 | |
3504 skip_bits(&s->gb, 384); //FIXME check /fix the bitstream readers | |
3505 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3506 //FIXME deblock filter, non_zero_count_cache init ... |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3507 memset(h->non_zero_count[mb_xy], 16, 16); |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
3508 s->current_picture.qscale_table[mb_xy]= s->qscale; |
1168 | 3509 |
3510 return 0; | |
3511 } | |
3512 | |
3513 fill_caches(h, mb_type); | |
3514 | |
3515 //mb_pred | |
3516 if(IS_INTRA(mb_type)){ | |
3517 // init_top_left_availability(h); | |
3518 if(IS_INTRA4x4(mb_type)){ | |
3519 int i; | |
3520 | |
3521 // fill_intra4x4_pred_table(h); | |
3522 for(i=0; i<16; i++){ | |
3523 const int mode_coded= !get_bits1(&s->gb); | |
3524 const int predicted_mode= pred_intra_mode(h, i); | |
3525 int mode; | |
3526 | |
3527 if(mode_coded){ | |
3528 const int rem_mode= get_bits(&s->gb, 3); | |
3529 if(rem_mode<predicted_mode) | |
3530 mode= rem_mode; | |
3531 else | |
3532 mode= rem_mode + 1; | |
3533 }else{ | |
3534 mode= predicted_mode; | |
3535 } | |
3536 | |
3537 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode; | |
3538 } | |
3539 write_back_intra_pred_mode(h); | |
3540 if( check_intra4x4_pred_mode(h) < 0) | |
3541 return -1; | |
3542 }else{ | |
3543 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode); | |
3544 if(h->intra16x16_pred_mode < 0) | |
3545 return -1; | |
3546 } | |
3547 h->chroma_pred_mode= get_ue_golomb(&s->gb); | |
3548 | |
3549 h->chroma_pred_mode= check_intra_pred_mode(h, h->chroma_pred_mode); | |
3550 if(h->chroma_pred_mode < 0) | |
3551 return -1; | |
3552 }else if(partition_count==4){ | |
3553 int i, j, sub_partition_count[4], list, ref[2][4]; | |
3554 | |
3555 if(h->slice_type == B_TYPE){ | |
3556 for(i=0; i<4; i++){ | |
3557 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
3558 if(h->sub_mb_type[i] >=13){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3559 av_log(h->s.avctx, AV_LOG_ERROR, "B sub_mb_type %d out of range at %d %d\n", h->sub_mb_type[i], s->mb_x, s->mb_y); |
1168 | 3560 return -1; |
3561 } | |
3562 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
3563 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
3564 } | |
3565 }else{ | |
3566 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ? | |
3567 for(i=0; i<4; i++){ | |
3568 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
3569 if(h->sub_mb_type[i] >=4){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3570 av_log(h->s.avctx, AV_LOG_ERROR, "P sub_mb_type %d out of range at %d %d\n", h->sub_mb_type[i], s->mb_x, s->mb_y); |
1168 | 3571 return -1; |
3572 } | |
3573 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
3574 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
3575 } | |
3576 } | |
3577 | |
3578 for(list=0; list<2; list++){ | |
3579 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; | |
3580 if(ref_count == 0) continue; | |
3581 for(i=0; i<4; i++){ | |
3582 if(IS_DIR(h->sub_mb_type[i], 0, list) && !IS_DIRECT(h->sub_mb_type[i])){ | |
3583 ref[list][i] = get_te0_golomb(&s->gb, ref_count); //FIXME init to 0 before and skip? | |
3584 }else{ | |
3585 //FIXME | |
3586 ref[list][i] = -1; | |
3587 } | |
3588 } | |
3589 } | |
3590 | |
3591 for(list=0; list<2; list++){ | |
3592 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; | |
3593 if(ref_count == 0) continue; | |
3594 | |
3595 for(i=0; i<4; i++){ | |
3596 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]= | |
3597 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i]; | |
3598 | |
3599 if(IS_DIR(h->sub_mb_type[i], 0, list) && !IS_DIRECT(h->sub_mb_type[i])){ | |
3600 const int sub_mb_type= h->sub_mb_type[i]; | |
3601 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1; | |
3602 for(j=0; j<sub_partition_count[i]; j++){ | |
3603 int mx, my; | |
3604 const int index= 4*i + block_width*j; | |
3605 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ]; | |
3606 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my); | |
3607 mx += get_se_golomb(&s->gb); | |
3608 my += get_se_golomb(&s->gb); | |
1170 | 3609 tprintf("final mv:%d %d\n", mx, my); |
3610 | |
1168 | 3611 if(IS_SUB_8X8(sub_mb_type)){ |
3612 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= | |
3613 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; | |
3614 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= | |
3615 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my; | |
3616 }else if(IS_SUB_8X4(sub_mb_type)){ | |
3617 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx; | |
3618 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my; | |
3619 }else if(IS_SUB_4X8(sub_mb_type)){ | |
3620 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx; | |
3621 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my; | |
3622 }else{ | |
3623 assert(IS_SUB_4X4(sub_mb_type)); | |
3624 mv_cache[ 0 ][0]= mx; | |
3625 mv_cache[ 0 ][1]= my; | |
3626 } | |
3627 } | |
3628 }else{ | |
3629 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0]; | |
3630 p[0] = p[1]= | |
3631 p[8] = p[9]= 0; | |
3632 } | |
3633 } | |
3634 } | |
3635 }else if(!IS_DIRECT(mb_type)){ | |
3636 int list, mx, my, i; | |
3637 //FIXME we should set ref_idx_l? to 0 if we use that later ... | |
3638 if(IS_16X16(mb_type)){ | |
3639 for(list=0; list<2; list++){ | |
3640 if(h->ref_count[0]>0){ | |
3641 if(IS_DIR(mb_type, 0, list)){ | |
3642 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
3643 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | |
3644 } | |
3645 } | |
3646 } | |
3647 for(list=0; list<2; list++){ | |
3648 if(IS_DIR(mb_type, 0, list)){ | |
3649 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); | |
3650 mx += get_se_golomb(&s->gb); | |
3651 my += get_se_golomb(&s->gb); | |
1170 | 3652 tprintf("final mv:%d %d\n", mx, my); |
3653 | |
1269 | 3654 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
1168 | 3655 } |
3656 } | |
3657 } | |
3658 else if(IS_16X8(mb_type)){ | |
3659 for(list=0; list<2; list++){ | |
3660 if(h->ref_count[list]>0){ | |
3661 for(i=0; i<2; i++){ | |
3662 if(IS_DIR(mb_type, i, list)){ | |
3663 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
3664 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); | |
3665 } | |
3666 } | |
3667 } | |
3668 } | |
3669 for(list=0; list<2; list++){ | |
3670 for(i=0; i<2; i++){ | |
3671 if(IS_DIR(mb_type, i, list)){ | |
3672 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my); | |
3673 mx += get_se_golomb(&s->gb); | |
3674 my += get_se_golomb(&s->gb); | |
1170 | 3675 tprintf("final mv:%d %d\n", mx, my); |
3676 | |
1269 | 3677 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
1168 | 3678 } |
3679 } | |
3680 } | |
3681 }else{ | |
3682 assert(IS_8X16(mb_type)); | |
3683 for(list=0; list<2; list++){ | |
3684 if(h->ref_count[list]>0){ | |
3685 for(i=0; i<2; i++){ | |
3686 if(IS_DIR(mb_type, i, list)){ //FIXME optimize | |
3687 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
3688 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); | |
3689 } | |
3690 } | |
3691 } | |
3692 } | |
3693 for(list=0; list<2; list++){ | |
3694 for(i=0; i<2; i++){ | |
3695 if(IS_DIR(mb_type, i, list)){ | |
3696 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my); | |
3697 mx += get_se_golomb(&s->gb); | |
3698 my += get_se_golomb(&s->gb); | |
1170 | 3699 tprintf("final mv:%d %d\n", mx, my); |
3700 | |
1269 | 3701 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
1168 | 3702 } |
3703 } | |
3704 } | |
3705 } | |
3706 } | |
3707 | |
3708 if(IS_INTER(mb_type)) | |
3709 write_back_motion(h, mb_type); | |
3710 | |
3711 if(!IS_INTRA16x16(mb_type)){ | |
3712 cbp= get_ue_golomb(&s->gb); | |
3713 if(cbp > 47){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3714 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%d) at %d %d\n", cbp, s->mb_x, s->mb_y); |
1168 | 3715 return -1; |
3716 } | |
3717 | |
3718 if(IS_INTRA4x4(mb_type)) | |
3719 cbp= golomb_to_intra4x4_cbp[cbp]; | |
3720 else | |
3721 cbp= golomb_to_inter_cbp[cbp]; | |
3722 } | |
3723 | |
3724 if(cbp || IS_INTRA16x16(mb_type)){ | |
3725 int i8x8, i4x4, chroma_idx; | |
3726 int chroma_qp, dquant; | |
3727 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr; | |
3728 const uint8_t *scan, *dc_scan; | |
3729 | |
3730 // fill_non_zero_count_cache(h); | |
3731 | |
3732 if(IS_INTERLACED(mb_type)){ | |
3733 scan= field_scan; | |
3734 dc_scan= luma_dc_field_scan; | |
3735 }else{ | |
3736 scan= zigzag_scan; | |
3737 dc_scan= luma_dc_zigzag_scan; | |
3738 } | |
3739 | |
3740 dquant= get_se_golomb(&s->gb); | |
3741 | |
3742 if( dquant > 25 || dquant < -26 ){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3743 av_log(h->s.avctx, AV_LOG_ERROR, "dquant out of range (%d) at %d %d\n", dquant, s->mb_x, s->mb_y); |
1168 | 3744 return -1; |
3745 } | |
3746 | |
3747 s->qscale += dquant; | |
3748 if(((unsigned)s->qscale) > 51){ | |
3749 if(s->qscale<0) s->qscale+= 52; | |
3750 else s->qscale-= 52; | |
3751 } | |
3752 | |
3753 h->chroma_qp= chroma_qp= get_chroma_qp(h, s->qscale); | |
3754 if(IS_INTRA16x16(mb_type)){ | |
3755 if( decode_residual(h, h->intra_gb_ptr, h->mb, LUMA_DC_BLOCK_INDEX, dc_scan, s->qscale, 16) < 0){ | |
3756 return -1; //FIXME continue if partotioned and other retirn -1 too | |
3757 } | |
3758 | |
3759 assert((cbp&15) == 0 || (cbp&15) == 15); | |
3760 | |
3761 if(cbp&15){ | |
3762 for(i8x8=0; i8x8<4; i8x8++){ | |
3763 for(i4x4=0; i4x4<4; i4x4++){ | |
3764 const int index= i4x4 + 4*i8x8; | |
3765 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, s->qscale, 15) < 0 ){ | |
3766 return -1; | |
3767 } | |
3768 } | |
3769 } | |
3770 }else{ | |
1636 | 3771 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1); |
1168 | 3772 } |
3773 }else{ | |
3774 for(i8x8=0; i8x8<4; i8x8++){ | |
3775 if(cbp & (1<<i8x8)){ | |
3776 for(i4x4=0; i4x4<4; i4x4++){ | |
3777 const int index= i4x4 + 4*i8x8; | |
3778 | |
3779 if( decode_residual(h, gb, h->mb + 16*index, index, scan, s->qscale, 16) <0 ){ | |
3780 return -1; | |
3781 } | |
3782 } | |
3783 }else{ | |
3784 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; | |
3785 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; | |
3786 } | |
3787 } | |
3788 } | |
3789 | |
3790 if(cbp&0x30){ | |
3791 for(chroma_idx=0; chroma_idx<2; chroma_idx++) | |
3792 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, chroma_qp, 4) < 0){ | |
3793 return -1; | |
3794 } | |
3795 } | |
3796 | |
3797 if(cbp&0x20){ | |
3798 for(chroma_idx=0; chroma_idx<2; chroma_idx++){ | |
3799 for(i4x4=0; i4x4<4; i4x4++){ | |
3800 const int index= 16 + 4*chroma_idx + i4x4; | |
3801 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, chroma_qp, 15) < 0){ | |
3802 return -1; | |
3803 } | |
3804 } | |
3805 } | |
3806 }else{ | |
3807 uint8_t * const nnz= &h->non_zero_count_cache[0]; | |
3808 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
3809 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
3810 } | |
3811 }else{ | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3812 uint8_t * const nnz= &h->non_zero_count_cache[0]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3813 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1); |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3814 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3815 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; |
1168 | 3816 } |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
3817 s->current_picture.qscale_table[mb_xy]= s->qscale; |
1168 | 3818 write_back_non_zero_count(h); |
3819 | |
3820 return 0; | |
3821 } | |
3822 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3823 static int decode_cabac_mb_type( H264Context *h ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3824 MpegEncContext * const s = &h->s; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3825 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3826 if( h->slice_type == I_TYPE ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3827 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3828 int ctx = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3829 int mb_type; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3830 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3831 if( s->mb_x > 0 && !IS_INTRA4x4( s->current_picture.mb_type[mb_xy-1] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3832 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3833 if( s->mb_y > 0 && !IS_INTRA4x4( s->current_picture.mb_type[mb_xy-s->mb_stride] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3834 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3835 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3836 if( get_cabac( &h->cabac, &h->cabac_state[3+ctx] ) == 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3837 return 0; /* I4x4 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3838 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3839 if( get_cabac_terminate( &h->cabac ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3840 return 25; /* PCM */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3841 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3842 mb_type = 1; /* I16x16 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3843 if( get_cabac( &h->cabac, &h->cabac_state[3+3] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3844 mb_type += 12; /* cbp_luma != 0 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3845 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3846 if( get_cabac( &h->cabac, &h->cabac_state[3+4] ) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3847 if( get_cabac( &h->cabac, &h->cabac_state[3+5] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3848 mb_type += 4 * 2; /* cbp_chroma == 2 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3849 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3850 mb_type += 4 * 1; /* cbp_chroma == 1 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3851 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3852 if( get_cabac( &h->cabac, &h->cabac_state[3+6] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3853 mb_type += 2; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3854 if( get_cabac( &h->cabac, &h->cabac_state[3+7] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3855 mb_type += 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3856 return mb_type; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3857 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3858 } else if( h->slice_type == P_TYPE ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3859 if( get_cabac( &h->cabac, &h->cabac_state[14] ) == 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3860 /* P-type */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3861 if( get_cabac( &h->cabac, &h->cabac_state[15] ) == 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3862 if( get_cabac( &h->cabac, &h->cabac_state[16] ) == 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3863 return 0; /* P_L0_D16x16; */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3864 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3865 return 3; /* P_8x8; */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3866 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3867 if( get_cabac( &h->cabac, &h->cabac_state[17] ) == 0 ) |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
3868 return 2; /* P_L0_D8x16; */ |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3869 else |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
3870 return 1; /* P_L0_D16x8; */ |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3871 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3872 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3873 int mb_type; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3874 /* I-type */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3875 if( get_cabac( &h->cabac, &h->cabac_state[17] ) == 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3876 return 5+0; /* I_4x4 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3877 if( get_cabac_terminate( &h->cabac ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3878 return 5+25; /*I_PCM */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3879 mb_type = 5+1; /* I16x16 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3880 if( get_cabac( &h->cabac, &h->cabac_state[17+1] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3881 mb_type += 12; /* cbp_luma != 0 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3882 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3883 if( get_cabac( &h->cabac, &h->cabac_state[17+2] ) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3884 if( get_cabac( &h->cabac, &h->cabac_state[17+2] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3885 mb_type += 4 * 2; /* cbp_chroma == 2 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3886 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3887 mb_type += 4 * 1; /* cbp_chroma == 1 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3888 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3889 if( get_cabac( &h->cabac, &h->cabac_state[17+3] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3890 mb_type += 2; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3891 if( get_cabac( &h->cabac, &h->cabac_state[17+3] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3892 mb_type += 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3893 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3894 return mb_type; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3895 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3896 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3897 /* TODO do others frames types */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3898 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3899 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3900 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3901 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3902 static int decode_cabac_mb_skip( H264Context *h) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3903 MpegEncContext * const s = &h->s; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3904 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3905 const int mba_xy = mb_xy - 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3906 const int mbb_xy = mb_xy - s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3907 int ctx = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3908 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3909 if( s->mb_x > 0 && !IS_SKIP( s->current_picture.mb_type[mba_xy] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3910 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3911 if( s->mb_y > 0 && !IS_SKIP( s->current_picture.mb_type[mbb_xy] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3912 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3913 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3914 if( h->slice_type == P_TYPE || h->slice_type == SP_TYPE) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3915 return get_cabac( &h->cabac, &h->cabac_state[11+ctx] ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3916 else /* B-frame */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3917 return get_cabac( &h->cabac, &h->cabac_state[24+ctx] ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3918 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3919 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3920 static int decode_cabac_mb_intra4x4_pred_mode( H264Context *h, int pred_mode ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3921 int mode = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3922 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3923 if( get_cabac( &h->cabac, &h->cabac_state[68] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3924 return pred_mode; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3925 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3926 if( get_cabac( &h->cabac, &h->cabac_state[69] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3927 mode += 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3928 if( get_cabac( &h->cabac, &h->cabac_state[69] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3929 mode += 2; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3930 if( get_cabac( &h->cabac, &h->cabac_state[69] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3931 mode += 4; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3932 if( mode >= pred_mode ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3933 return mode + 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3934 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3935 return mode; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3936 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3937 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3938 static int decode_cabac_mb_chroma_pre_mode( H264Context *h) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3939 MpegEncContext * const s = &h->s; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3940 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3941 const int mba_xy = mb_xy - 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3942 const int mbb_xy = mb_xy - s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3943 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3944 int ctx = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3945 |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
3946 /* No need to test for IS_INTRA4x4 and IS_INTRA16x16, as we set chroma_pred_mode_table to 0 */ |
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
3947 if( s->mb_x > 0 && h->chroma_pred_mode_table[mba_xy] != 0 ) |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3948 ctx++; |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
3949 |
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
3950 if( s->mb_y > 0 && h->chroma_pred_mode_table[mbb_xy] != 0 ) |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3951 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3952 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3953 if( get_cabac( &h->cabac, &h->cabac_state[64+ctx] ) == 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3954 return 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3955 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3956 if( get_cabac( &h->cabac, &h->cabac_state[64+3] ) == 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3957 return 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3958 if( get_cabac( &h->cabac, &h->cabac_state[64+3] ) == 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3959 return 2; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3960 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3961 return 3; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3962 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3963 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3964 static const uint8_t block_idx_x[16] = { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3965 0, 1, 0, 1, 2, 3, 2, 3, 0, 1, 0, 1, 2, 3, 2, 3 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3966 }; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3967 static const uint8_t block_idx_y[16] = { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3968 0, 0, 1, 1, 0, 0, 1, 1, 2, 2, 3, 3, 2, 2, 3, 3 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3969 }; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3970 static const uint8_t block_idx_xy[4][4] = { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3971 { 0, 2, 8, 10}, |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3972 { 1, 3, 9, 11}, |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3973 { 4, 6, 12, 14}, |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3974 { 5, 7, 13, 15} |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3975 }; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3976 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3977 static int decode_cabac_mb_cbp_luma( H264Context *h) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3978 MpegEncContext * const s = &h->s; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3979 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3980 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3981 int cbp = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3982 int i8x8; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3983 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3984 h->cbp_table[mb_xy] = 0; /* FIXME aaahahahah beurk */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3985 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3986 for( i8x8 = 0; i8x8 < 4; i8x8++ ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3987 int mba_xy = -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3988 int mbb_xy = -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3989 int x, y; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3990 int ctx = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3991 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3992 x = block_idx_x[4*i8x8]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3993 y = block_idx_y[4*i8x8]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3994 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3995 if( x > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3996 mba_xy = mb_xy; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3997 else if( s->mb_x > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3998 mba_xy = mb_xy - 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3999 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4000 if( y > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4001 mbb_xy = mb_xy; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4002 else if( s->mb_y > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4003 mbb_xy = mb_xy - s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4004 |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4005 /* No need to test for skip as we put 0 for skip block */ |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4006 if( mba_xy >= 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4007 int i8x8a = block_idx_xy[(x-1)&0x03][y]/4; |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4008 if( ((h->cbp_table[mba_xy] >> i8x8a)&0x01) == 0 ) |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4009 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4010 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4011 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4012 if( mbb_xy >= 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4013 int i8x8b = block_idx_xy[x][(y-1)&0x03]/4; |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4014 if( ((h->cbp_table[mbb_xy] >> i8x8b)&0x01) == 0 ) |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4015 ctx += 2; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4016 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4017 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4018 if( get_cabac( &h->cabac, &h->cabac_state[73 + ctx] ) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4019 cbp |= 1 << i8x8; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4020 h->cbp_table[mb_xy] = cbp; /* FIXME aaahahahah beurk */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4021 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4022 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4023 return cbp; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4024 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4025 static int decode_cabac_mb_cbp_chroma( H264Context *h) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4026 MpegEncContext * const s = &h->s; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4027 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4028 int ctx; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4029 int cbp_a, cbp_b; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4030 |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4031 /* No need to test for skip */ |
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4032 if( s->mb_x > 0 ) |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4033 cbp_a = (h->cbp_table[mb_xy-1]>>4)&0x03; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4034 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4035 cbp_a = -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4036 |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4037 if( s->mb_y > 0 ) |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4038 cbp_b = (h->cbp_table[mb_xy-s->mb_stride]>>4)&0x03; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4039 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4040 cbp_b = -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4041 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4042 ctx = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4043 if( cbp_a > 0 ) ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4044 if( cbp_b > 0 ) ctx += 2; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4045 if( get_cabac( &h->cabac, &h->cabac_state[77 + ctx] ) == 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4046 return 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4047 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4048 ctx = 4; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4049 if( cbp_a == 2 ) ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4050 if( cbp_b == 2 ) ctx += 2; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4051 if( get_cabac( &h->cabac, &h->cabac_state[77 + ctx] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4052 return 2; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4053 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4054 return 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4055 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4056 static int decode_cabac_mb_dqp( H264Context *h) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4057 MpegEncContext * const s = &h->s; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4058 int mbn_xy; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4059 int ctx = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4060 int val = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4061 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4062 if( s->mb_x > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4063 mbn_xy = s->mb_x + s->mb_y*s->mb_stride - 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4064 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4065 mbn_xy = s->mb_width - 1 + (s->mb_y-1)*s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4066 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4067 if( mbn_xy >= 0 && h->last_qscale_diff != 0 && ( IS_INTRA16x16(s->current_picture.mb_type[mbn_xy] ) || (h->cbp_table[mbn_xy]&0x3f) ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4068 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4069 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4070 while( get_cabac( &h->cabac, &h->cabac_state[60 + ctx] ) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4071 if( ctx < 2 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4072 ctx = 2; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4073 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4074 ctx = 3; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4075 val++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4076 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4077 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4078 if( val&0x01 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4079 return (val + 1)/2; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4080 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4081 return -(val + 1)/2; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4082 } |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4083 static int decode_cabac_mb_sub_type( H264Context *h ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4084 if( get_cabac( &h->cabac, &h->cabac_state[21] ) ) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4085 return 0; /* 8x8 */ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4086 if( !get_cabac( &h->cabac, &h->cabac_state[22] ) ) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4087 return 1; /* 8x4 */ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4088 if( get_cabac( &h->cabac, &h->cabac_state[23] ) ) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4089 return 2; /* 4x8 */ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4090 return 3; /* 4x4 */ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4091 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4092 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4093 static int decode_cabac_mb_ref( H264Context *h, int list, int n ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4094 int refa = h->ref_cache[list][scan8[n] - 1]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4095 int refb = h->ref_cache[list][scan8[n] - 8]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4096 int ref = 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4097 int ctx = 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4098 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4099 if( refa > 0 ) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4100 ctx++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4101 if( refb > 0 ) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4102 ctx += 2; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4103 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4104 while( get_cabac( &h->cabac, &h->cabac_state[54+ctx] ) ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4105 ref++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4106 if( ctx < 4 ) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4107 ctx = 4; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4108 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4109 ctx = 5; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4110 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4111 return ref; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4112 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4113 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4114 static int decode_cabac_mb_mvd( H264Context *h, int list, int n, int l ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4115 int amvd = abs( h->mvd_cache[list][scan8[n] - 1][l] ) + |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4116 abs( h->mvd_cache[list][scan8[n] - 8][l] ); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4117 int ctxbase = (l == 0) ? 40 : 47; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4118 int ctx; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4119 int mvd = 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4120 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4121 if( amvd < 3 ) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4122 ctx = 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4123 else if( amvd > 32 ) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4124 ctx = 2; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4125 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4126 ctx = 1; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4127 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4128 while( mvd < 9 && get_cabac( &h->cabac, &h->cabac_state[ctxbase+ctx] ) ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4129 mvd++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4130 if( ctx < 3 ) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4131 ctx = 3; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4132 else if( ctx < 6 ) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4133 ctx++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4134 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4135 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4136 if( mvd >= 9 ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4137 int k = 3; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4138 while( get_cabac_bypass( &h->cabac ) ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4139 mvd += 1 << k; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4140 k++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4141 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4142 while( k-- ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4143 if( get_cabac_bypass( &h->cabac ) ) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4144 mvd += 1 << k; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4145 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4146 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4147 if( mvd != 0 && get_cabac_bypass( &h->cabac ) ) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4148 return -mvd; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4149 return mvd; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4150 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4151 |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4152 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4153 static int get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4154 MpegEncContext * const s = &h->s; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4155 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4156 int mba_xy = -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4157 int mbb_xy = -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4158 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4159 int nza = -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4160 int nzb = -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4161 int ctx = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4162 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4163 if( cat == 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4164 if( s->mb_x > 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4165 mba_xy = mb_xy - 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4166 if( IS_INTRA16x16(s->current_picture.mb_type[mba_xy] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4167 nza = h->cbp_table[mba_xy]&0x100; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4168 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4169 if( s->mb_y > 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4170 mbb_xy = mb_xy - s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4171 if( IS_INTRA16x16(s->current_picture.mb_type[mbb_xy] ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4172 nzb = h->cbp_table[mbb_xy]&0x100; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4173 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4174 } else if( cat == 1 || cat == 2 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4175 int i8x8a, i8x8b; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4176 int x, y; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4177 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4178 x = block_idx_x[idx]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4179 y = block_idx_y[idx]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4180 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4181 if( x > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4182 mba_xy = mb_xy; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4183 else if( s->mb_x > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4184 mba_xy = mb_xy - 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4185 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4186 if( y > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4187 mbb_xy = mb_xy; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4188 else if( s->mb_y > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4189 mbb_xy = mb_xy - s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4190 |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4191 /* No need to test for skip */ |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4192 if( mba_xy >= 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4193 i8x8a = block_idx_xy[(x-1)&0x03][y]/4; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4194 |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4195 if( !IS_INTRA_PCM(s->current_picture.mb_type[mba_xy] ) && |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4196 ((h->cbp_table[mba_xy]&0x0f)>>i8x8a)) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4197 nza = h->non_zero_count_cache[scan8[idx] - 1]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4198 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4199 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4200 if( mbb_xy >= 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4201 i8x8b = block_idx_xy[x][(y-1)&0x03]/4; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4202 |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4203 if( !IS_INTRA_PCM(s->current_picture.mb_type[mbb_xy] ) && |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4204 ((h->cbp_table[mbb_xy]&0x0f)>>i8x8b)) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4205 nzb = h->non_zero_count_cache[scan8[idx] - 8]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4206 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4207 } else if( cat == 3 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4208 if( s->mb_x > 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4209 mba_xy = mb_xy - 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4210 |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4211 if( !IS_INTRA_PCM(s->current_picture.mb_type[mba_xy] ) && |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4212 (h->cbp_table[mba_xy]&0x30) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4213 nza = (h->cbp_table[mba_xy]>>(6+idx))&0x01; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4214 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4215 if( s->mb_y > 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4216 mbb_xy = mb_xy - s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4217 |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4218 if( !IS_INTRA_PCM(s->current_picture.mb_type[mbb_xy] ) && |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4219 (h->cbp_table[mbb_xy]&0x30) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4220 nzb = (h->cbp_table[mbb_xy]>>(6+idx))&0x01; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4221 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4222 } else if( cat == 4 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4223 int idxc = idx % 4 ; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4224 if( idxc == 1 || idxc == 3 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4225 mba_xy = mb_xy; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4226 else if( s->mb_x > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4227 mba_xy = mb_xy -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4228 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4229 if( idxc == 2 || idxc == 3 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4230 mbb_xy = mb_xy; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4231 else if( s->mb_y > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4232 mbb_xy = mb_xy - s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4233 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4234 if( mba_xy >= 0 && |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4235 !IS_INTRA_PCM(s->current_picture.mb_type[mba_xy] ) && |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4236 (h->cbp_table[mba_xy]&0x30) == 0x20 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4237 nza = h->non_zero_count_cache[scan8[16+idx] - 1]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4238 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4239 if( mbb_xy >= 0 && |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4240 !IS_INTRA_PCM(s->current_picture.mb_type[mbb_xy] ) && |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4241 (h->cbp_table[mbb_xy]&0x30) == 0x20 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4242 nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4243 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4244 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4245 if( ( mba_xy < 0 && IS_INTRA( s->current_picture.mb_type[mb_xy] ) ) || |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4246 ( mba_xy >= 0 && IS_INTRA_PCM(s->current_picture.mb_type[mba_xy] ) ) || |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4247 nza > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4248 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4249 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4250 if( ( mbb_xy < 0 && IS_INTRA( s->current_picture.mb_type[mb_xy] ) ) || |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4251 ( mbb_xy >= 0 && IS_INTRA_PCM(s->current_picture.mb_type[mbb_xy] ) ) || |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4252 nzb > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4253 ctx += 2; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4254 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4255 return ctx + 4 * cat; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4256 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4257 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4258 static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, int qp, int max_coeff) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4259 const int mb_xy = h->s.mb_x + h->s.mb_y*h->s.mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4260 const uint16_t *qmul= dequant_coeff[qp]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4261 static const int significant_coeff_flag_offset[5] = { 0, 15, 29, 44, 47 }; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4262 static const int last_significant_coeff_flag_offset[5] = { 0, 15, 29, 44, 47 }; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4263 static const int coeff_abs_level_m1_offset[5] = { 0, 10, 20, 30, 39 }; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4264 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4265 int coeff[16]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4266 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4267 int last = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4268 int coeff_count = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4269 int nz[16] = {0}; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4270 int i; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4271 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4272 int abslevel1 = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4273 int abslevelgt1 = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4274 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4275 /* cat: 0-> DC 16x16 n = 0 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4276 * 1-> AC 16x16 n = luma4x4idx |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4277 * 2-> Luma4x4 n = luma4x4idx |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4278 * 3-> DC Chroma n = iCbCr |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4279 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4280 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4281 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4282 /* read coded block flag */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4283 if( get_cabac( &h->cabac, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n ) ] ) == 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4284 if( cat == 1 || cat == 2 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4285 h->non_zero_count_cache[scan8[n]] = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4286 else if( cat == 4 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4287 h->non_zero_count_cache[scan8[16+n]] = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4288 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4289 return 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4290 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4291 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4292 while( last < max_coeff - 1 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4293 int ctx = FFMIN( last, max_coeff - 2 ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4294 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4295 if( get_cabac( &h->cabac, &h->cabac_state[105+significant_coeff_flag_offset[cat]+ctx] ) == 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4296 nz[last++] = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4297 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4298 else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4299 nz[last++] = 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4300 coeff_count++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4301 if( get_cabac( &h->cabac, &h->cabac_state[166+last_significant_coeff_flag_offset[cat]+ctx] ) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4302 while( last < max_coeff ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4303 nz[last++] = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4304 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4305 break; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4306 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4307 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4308 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4309 if( last == max_coeff -1 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4310 nz[last++] = 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4311 coeff_count++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4312 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4313 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4314 if( cat == 0 && coeff_count > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4315 h->cbp_table[mb_xy] |= 0x100; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4316 else if( cat == 1 || cat == 2 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4317 h->non_zero_count_cache[scan8[n]] = coeff_count; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4318 else if( cat == 3 && coeff_count > 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4319 h->cbp_table[mb_xy] |= 0x40 << n; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4320 else if( cat == 4 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4321 h->non_zero_count_cache[scan8[16+n]] = coeff_count; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4322 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4323 for( i = coeff_count - 1; i >= 0; i-- ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4324 int coeff_abs_m1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4325 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4326 int ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 + 1 )) + coeff_abs_level_m1_offset[cat]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4327 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4328 if( get_cabac( &h->cabac, &h->cabac_state[227+ctx] ) == 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4329 coeff_abs_m1 = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4330 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4331 coeff_abs_m1 = 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4332 ctx = 5 + FFMIN( 4, abslevelgt1 ) + coeff_abs_level_m1_offset[cat]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4333 while( coeff_abs_m1 < 14 && get_cabac( &h->cabac, &h->cabac_state[227+ctx] ) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4334 coeff_abs_m1++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4335 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4336 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4337 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4338 if( coeff_abs_m1 >= 14 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4339 int j = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4340 while( get_cabac_bypass( &h->cabac ) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4341 coeff_abs_m1 += 1 << j; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4342 j++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4343 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4344 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4345 while( j-- ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4346 if( get_cabac_bypass( &h->cabac ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4347 coeff_abs_m1 += 1 << j ; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4348 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4349 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4350 if( get_cabac_bypass( &h->cabac ) ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4351 coeff[i] = -1 *( coeff_abs_m1 + 1 ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4352 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4353 coeff[i] = coeff_abs_m1 + 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4354 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4355 if( coeff_abs_m1 == 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4356 abslevel1++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4357 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4358 abslevelgt1++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4359 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4360 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4361 if( cat == 0 || cat == 3 ) { /* DC */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4362 int j; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4363 for( i = 0, j = 0; j < coeff_count; i++ ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4364 if( nz[i] ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4365 block[scantable[i]] = coeff[j]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4366 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4367 j++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4368 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4369 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4370 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4371 } else { /* AC */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4372 int j; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4373 for( i = 0, j = 0; j < coeff_count; i++ ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4374 if( nz[i] ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4375 block[scantable[i]] = coeff[j] * qmul[scantable[i]]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4376 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4377 j++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4378 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4379 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4380 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4381 return 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4382 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4383 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4384 /** |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4385 * decodes a macroblock |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4386 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4387 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4388 static int decode_mb_cabac(H264Context *h) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4389 MpegEncContext * const s = &h->s; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4390 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4391 int mb_type, partition_count, cbp = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4392 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4393 s->dsp.clear_blocks(h->mb); //FIXME avoid if allready clear (move after skip handlong?) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4394 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4395 if( h->slice_type == B_TYPE ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4396 av_log( h->s.avctx, AV_LOG_ERROR, "B-frame not supported with CABAC\n" ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4397 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4398 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4399 if( h->sps.mb_aff ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4400 av_log( h->s.avctx, AV_LOG_ERROR, "Fields not supported with CABAC\n" ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4401 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4402 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4403 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4404 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4405 /* read skip flags */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4406 if( decode_cabac_mb_skip( h ) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4407 int mx, my; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4408 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4409 /* skip mb */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4410 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4411 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4412 memset(h->non_zero_count[mb_xy], 0, 16); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4413 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4414 #if 0 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4415 if(h->sps.mb_aff && s->mb_skip_run==0 && (s->mb_y&1)==0){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4416 h->mb_field_decoding_flag= get_bits1(&s->gb); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4417 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4418 if(h->mb_field_decoding_flag) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4419 mb_type|= MB_TYPE_INTERLACED; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4420 #endif |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4421 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4422 fill_caches(h, mb_type); //FIXME check what is needed and what not ... |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4423 pred_pskip_motion(h, &mx, &my); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4424 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4425 fill_rectangle( h->mvd_cache[0][scan8[0]], 4, 4, 8, pack16to32(0,0), 4); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4426 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4427 write_back_motion(h, mb_type); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4428 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4429 s->current_picture.mb_type[mb_xy]= mb_type; //FIXME SKIP type |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4430 s->current_picture.qscale_table[mb_xy]= s->qscale; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4431 h->slice_table[ mb_xy ]= h->slice_num; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4432 h->cbp_table[mb_xy] = 0; |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4433 h->chroma_pred_mode_table[mb_xy] = 0; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4434 h->last_qscale_diff = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4435 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4436 h->prev_mb_skiped= 1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4437 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4438 return 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4439 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4440 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4441 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4442 h->prev_mb_skiped = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4443 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4444 if( ( mb_type = decode_cabac_mb_type( h ) ) < 0 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4445 av_log( h->s.avctx, AV_LOG_ERROR, "decode_cabac_mb_type failed\n" ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4446 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4447 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4448 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4449 if( h->slice_type == P_TYPE ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4450 if( mb_type < 5) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4451 partition_count= p_mb_type_info[mb_type].partition_count; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4452 mb_type= p_mb_type_info[mb_type].type; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4453 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4454 mb_type -= 5; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4455 goto decode_intra_mb; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4456 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4457 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4458 assert(h->slice_type == I_TYPE); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4459 decode_intra_mb: |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4460 partition_count = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4461 cbp= i_mb_type_info[mb_type].cbp; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4462 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4463 mb_type= i_mb_type_info[mb_type].type; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4464 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4465 #if 0 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4466 if(h->mb_field_decoding_flag) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4467 mb_type |= MB_TYPE_INTERLACED; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4468 #endif |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4469 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4470 s->current_picture.mb_type[mb_xy]= mb_type; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4471 h->slice_table[ mb_xy ]= h->slice_num; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4472 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4473 if(IS_INTRA_PCM(mb_type)) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4474 /* TODO */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4475 h->cbp_table[mb_xy] = 0xf +4*2; |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4476 h->chroma_pred_mode_table[mb_xy] = 0; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4477 s->current_picture.qscale_table[mb_xy]= s->qscale; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4478 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4479 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4480 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4481 fill_caches(h, mb_type); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4482 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4483 if( IS_INTRA( mb_type ) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4484 if( IS_INTRA4x4( mb_type ) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4485 int i; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4486 for( i = 0; i < 16; i++ ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4487 int pred = pred_intra_mode( h, i ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4488 h->intra4x4_pred_mode_cache[ scan8[i] ] = decode_cabac_mb_intra4x4_pred_mode( h, pred ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4489 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4490 //av_log( s->avctx, AV_LOG_ERROR, "i4x4 pred=%d mode=%d\n", pred, h->intra4x4_pred_mode_cache[ scan8[i] ] ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4491 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4492 write_back_intra_pred_mode(h); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4493 if( check_intra4x4_pred_mode(h) < 0 ) return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4494 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4495 h->intra16x16_pred_mode= check_intra_pred_mode( h, h->intra16x16_pred_mode ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4496 if( h->intra16x16_pred_mode < 0 ) return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4497 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4498 h->chroma_pred_mode_table[mb_xy] = |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4499 h->chroma_pred_mode = decode_cabac_mb_chroma_pre_mode( h ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4500 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4501 h->chroma_pred_mode= check_intra_pred_mode( h, h->chroma_pred_mode ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4502 if( h->chroma_pred_mode < 0 ) return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4503 } else if( partition_count == 4 ) { |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4504 int i, j, sub_partition_count[4], list, ref[2][4]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4505 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4506 /* Only P-frame */ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4507 for( i = 0; i < 4; i++ ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4508 h->sub_mb_type[i] = decode_cabac_mb_sub_type( h ); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4509 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4510 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4511 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4512 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4513 for( list = 0; list < 2; list++ ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4514 if( h->ref_count[list] > 0 ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4515 for( i = 0; i < 4; i++ ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4516 if(IS_DIR(h->sub_mb_type[i], 0, list) && !IS_DIRECT(h->sub_mb_type[i])){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4517 if( h->ref_count[list] > 1 ) |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4518 ref[list][i] = decode_cabac_mb_ref( h, list, 4*i ); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4519 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4520 ref[list][i] = 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4521 } else { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4522 ref[list][i] = -1; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4523 } |
2110 | 4524 h->ref_cache[list][ scan8[4*i]+1 ]= |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4525 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4526 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4527 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4528 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4529 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4530 for(list=0; list<2; list++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4531 for(i=0; i<4; i++){ |
2110 | 4532 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]; |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4533 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4534 if(IS_DIR(h->sub_mb_type[i], 0, list) && !IS_DIRECT(h->sub_mb_type[i])){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4535 const int sub_mb_type= h->sub_mb_type[i]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4536 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4537 for(j=0; j<sub_partition_count[i]; j++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4538 int mpx, mpy; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4539 int mx, my; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4540 const int index= 4*i + block_width*j; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4541 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4542 int16_t (* mvd_cache)[2]= &h->mvd_cache[list][ scan8[index] ]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4543 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mpx, &mpy); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4544 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4545 mx = mpx + decode_cabac_mb_mvd( h, list, index, 0 ); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4546 my = mpy + decode_cabac_mb_mvd( h, list, index, 1 ); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4547 tprintf("final mv:%d %d\n", mx, my); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4548 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4549 if(IS_SUB_8X8(sub_mb_type)){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4550 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4551 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4552 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4553 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4554 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4555 mvd_cache[ 0 ][0]= mvd_cache[ 1 ][0]= |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4556 mvd_cache[ 8 ][0]= mvd_cache[ 9 ][0]= mx - mpx; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4557 mvd_cache[ 0 ][1]= mvd_cache[ 1 ][1]= |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4558 mvd_cache[ 8 ][1]= mvd_cache[ 9 ][1]= my - mpy; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4559 }else if(IS_SUB_8X4(sub_mb_type)){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4560 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4561 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4562 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4563 mvd_cache[ 0 ][0]= mvd_cache[ 1 ][0]= mx- mpx; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4564 mvd_cache[ 0 ][1]= mvd_cache[ 1 ][1]= my - mpy; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4565 }else if(IS_SUB_4X8(sub_mb_type)){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4566 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4567 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4568 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4569 mvd_cache[ 0 ][0]= mvd_cache[ 8 ][0]= mx - mpx; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4570 mvd_cache[ 0 ][1]= mvd_cache[ 8 ][1]= my - mpy; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4571 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4572 assert(IS_SUB_4X4(sub_mb_type)); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4573 mv_cache[ 0 ][0]= mx; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4574 mv_cache[ 0 ][1]= my; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4575 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4576 mvd_cache[ 0 ][0]= mx - mpx; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4577 mvd_cache[ 0 ][1]= my - mpy; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4578 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4579 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4580 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4581 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4582 uint32_t *pd= (uint32_t *)&h->mvd_cache[list][ scan8[4*i] ][0]; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4583 p[0] = p[1] = p[8] = p[9] = 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4584 pd[0]= pd[1]= pd[8]= pd[9]= 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4585 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4586 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4587 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4588 } else if( !IS_DIRECT(mb_type) ) { |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4589 int list, mx, my, i, mpx, mpy; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4590 if(IS_16X16(mb_type)){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4591 for(list=0; list<2; list++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4592 if(IS_DIR(mb_type, 0, list)){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4593 if(h->ref_count[list] > 0 ){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4594 const int ref = h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 0 ) : 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4595 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, ref, 1); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4596 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4597 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4598 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4599 for(list=0; list<2; list++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4600 if(IS_DIR(mb_type, 0, list)){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4601 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mpx, &mpy); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4602 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4603 mx = mpx + decode_cabac_mb_mvd( h, list, 0, 0 ); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4604 my = mpy + decode_cabac_mb_mvd( h, list, 0, 1 ); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4605 tprintf("final mv:%d %d\n", mx, my); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4606 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4607 fill_rectangle(h->mvd_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx-mpx,my-mpy), 4); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4608 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4609 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4610 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4611 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4612 else if(IS_16X8(mb_type)){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4613 for(list=0; list<2; list++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4614 if(h->ref_count[list]>0){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4615 for(i=0; i<2; i++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4616 if(IS_DIR(mb_type, i, list)){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4617 const int ref= h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 8*i ) : 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4618 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, ref, 1); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4619 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4620 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4621 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4622 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4623 for(list=0; list<2; list++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4624 for(i=0; i<2; i++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4625 if(IS_DIR(mb_type, i, list)){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4626 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mpx, &mpy); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4627 mx = mpx + decode_cabac_mb_mvd( h, list, 8*i, 0 ); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4628 my = mpy + decode_cabac_mb_mvd( h, list, 8*i, 1 ); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4629 tprintf("final mv:%d %d\n", mx, my); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4630 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4631 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx-mpx,my-mpy), 4); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4632 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4633 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4634 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4635 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4636 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4637 assert(IS_8X16(mb_type)); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4638 for(list=0; list<2; list++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4639 if(h->ref_count[list]>0){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4640 for(i=0; i<2; i++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4641 if(IS_DIR(mb_type, i, list)){ //FIXME optimize |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4642 const int ref= h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 4*i ) : 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4643 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, ref, 1); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4644 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4645 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4646 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4647 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4648 for(list=0; list<2; list++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4649 for(i=0; i<2; i++){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4650 if(IS_DIR(mb_type, i, list)){ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4651 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mpx, &mpy); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4652 mx = mpx + decode_cabac_mb_mvd( h, list, 4*i, 0 ); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4653 my = mpy + decode_cabac_mb_mvd( h, list, 4*i, 1 ); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4654 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4655 tprintf("final mv:%d %d\n", mx, my); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4656 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx-mpx,my-mpy), 4); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4657 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4658 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4659 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4660 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4661 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4662 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4663 |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4664 if( IS_INTER( mb_type ) ) { |
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4665 h->chroma_pred_mode_table[mb_xy] = 0; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4666 write_back_motion( h, mb_type ); |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4667 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4668 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4669 if( !IS_INTRA16x16( mb_type ) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4670 cbp = decode_cabac_mb_cbp_luma( h ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4671 cbp |= decode_cabac_mb_cbp_chroma( h ) << 4; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4672 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4673 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4674 h->cbp_table[mb_xy] = cbp; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4675 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4676 if( cbp || IS_INTRA16x16( mb_type ) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4677 const uint8_t *scan, *dc_scan; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4678 int dqp; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4679 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4680 if(IS_INTERLACED(mb_type)){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4681 scan= field_scan; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4682 dc_scan= luma_dc_field_scan; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4683 }else{ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4684 scan= zigzag_scan; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4685 dc_scan= luma_dc_zigzag_scan; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4686 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4687 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4688 h->last_qscale_diff = dqp = decode_cabac_mb_dqp( h ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4689 s->qscale += dqp; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4690 if(((unsigned)s->qscale) > 51){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4691 if(s->qscale<0) s->qscale+= 52; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4692 else s->qscale-= 52; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4693 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4694 h->chroma_qp = get_chroma_qp(h, s->qscale); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4695 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4696 if( IS_INTRA16x16( mb_type ) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4697 int i; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4698 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4699 if( decode_cabac_residual( h, h->mb, 0, 0, dc_scan, s->qscale, 16) < 0) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4700 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4701 if( cbp&15 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4702 for( i = 0; i < 16; i++ ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4703 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4704 if( decode_cabac_residual(h, h->mb + 16*i, 1, i, scan + 1, s->qscale, 15) < 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4705 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4706 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4707 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4708 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4709 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4710 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4711 int i8x8, i4x4; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4712 for( i8x8 = 0; i8x8 < 4; i8x8++ ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4713 if( cbp & (1<<i8x8) ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4714 for( i4x4 = 0; i4x4 < 4; i4x4++ ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4715 const int index = 4*i8x8 + i4x4; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4716 //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4717 if( decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, s->qscale, 16) < 0 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4718 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4719 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4720 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4721 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4722 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4723 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4724 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4725 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4726 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4727 if( cbp&0x30 ){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4728 int c; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4729 for( c = 0; c < 2; c++ ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4730 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4731 if( decode_cabac_residual(h, h->mb + 256 + 16*4*c, 3, c, chroma_dc_scan, h->chroma_qp, 4) < 0) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4732 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4733 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4734 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4735 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4736 if( cbp&0x20 ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4737 int c, i; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4738 for( c = 0; c < 2; c++ ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4739 for( i = 0; i < 4; i++ ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4740 const int index = 16 + 4 * c + i; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4741 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4742 if( decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, h->chroma_qp, 15) < 0) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4743 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4744 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4745 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4746 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4747 uint8_t * const nnz= &h->non_zero_count_cache[0]; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4748 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4749 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4750 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4751 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4752 memset( &h->non_zero_count_cache[8], 0, 8*5 ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4753 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4754 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4755 s->current_picture.qscale_table[mb_xy]= s->qscale; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4756 write_back_non_zero_count(h); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4757 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4758 return 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4759 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4760 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4761 |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4762 static void filter_mb_edgev( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4763 int i, d; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4764 const int index_a = clip( qp + h->slice_alpha_c0_offset, 0, 51 ); |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4765 const int alpha = alpha_table[index_a]; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4766 const int beta = beta_table[clip( qp + h->slice_beta_offset, 0, 51 )]; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4767 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4768 for( i = 0; i < 4; i++ ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4769 if( bS[i] == 0 ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4770 pix += 4 * stride; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4771 continue; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4772 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4773 |
1898 | 4774 if( bS[i] < 4 ) { |
4775 const int tc0 = tc0_table[index_a][bS[i] - 1]; | |
4776 /* 4px edge length */ | |
4777 for( d = 0; d < 4; d++ ) { | |
4778 const int p0 = pix[-1]; | |
4779 const int p1 = pix[-2]; | |
4780 const int p2 = pix[-3]; | |
4781 const int q0 = pix[0]; | |
4782 const int q1 = pix[1]; | |
4783 const int q2 = pix[2]; | |
4784 | |
4785 if( ABS( p0 - q0 ) < alpha && | |
4786 ABS( p1 - p0 ) < beta && | |
4787 ABS( q1 - q0 ) < beta ) { | |
4788 int tc = tc0; | |
4789 int i_delta; | |
4790 | |
4791 if( ABS( p2 - p0 ) < beta ) { | |
4792 pix[-2] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); | |
4793 tc++; | |
4794 } | |
4795 if( ABS( q2 - q0 ) < beta ) { | |
4796 pix[1] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); | |
4797 tc++; | |
4798 } | |
4799 | |
4800 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
4801 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ | |
4802 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4803 } |
1898 | 4804 pix += stride; |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4805 } |
1898 | 4806 }else{ |
4807 /* 4px edge length */ | |
4808 for( d = 0; d < 4; d++ ) { | |
4809 const int p0 = pix[-1]; | |
4810 const int p1 = pix[-2]; | |
4811 const int p2 = pix[-3]; | |
4812 | |
4813 const int q0 = pix[0]; | |
4814 const int q1 = pix[1]; | |
4815 const int q2 = pix[2]; | |
4816 | |
4817 if( ABS( p0 - q0 ) < alpha && | |
4818 ABS( p1 - p0 ) < beta && | |
4819 ABS( q1 - q0 ) < beta ) { | |
4820 | |
4821 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
4822 if( ABS( p2 - p0 ) < beta) | |
4823 { | |
4824 const int p3 = pix[-4]; | |
4825 /* p0', p1', p2' */ | |
4826 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
4827 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
4828 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
4829 } else { | |
4830 /* p0' */ | |
4831 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
4832 } | |
4833 if( ABS( q2 - q0 ) < beta) | |
4834 { | |
4835 const int q3 = pix[3]; | |
4836 /* q0', q1', q2' */ | |
4837 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
4838 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
4839 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
4840 } else { | |
4841 /* q0' */ | |
4842 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
4843 } | |
4844 }else{ | |
4845 /* p0', q0' */ | |
4846 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
4847 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
4848 } | |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4849 } |
1898 | 4850 pix += stride; |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4851 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4852 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4853 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4854 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4855 static void filter_mb_edgecv( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4856 int i, d; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4857 const int index_a = clip( qp + h->slice_alpha_c0_offset, 0, 51 ); |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4858 const int alpha = alpha_table[index_a]; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4859 const int beta = beta_table[clip( qp + h->slice_beta_offset, 0, 51 )]; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4860 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4861 for( i = 0; i < 4; i++ ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4862 if( bS[i] == 0 ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4863 pix += 2 * stride; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4864 continue; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4865 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4866 |
1898 | 4867 if( bS[i] < 4 ) { |
4868 const int tc = tc0_table[index_a][bS[i] - 1] + 1; | |
4869 /* 2px edge length (because we use same bS than the one for luma) */ | |
4870 for( d = 0; d < 2; d++ ){ | |
4871 const int p0 = pix[-1]; | |
4872 const int p1 = pix[-2]; | |
4873 const int q0 = pix[0]; | |
4874 const int q1 = pix[1]; | |
4875 | |
4876 if( ABS( p0 - q0 ) < alpha && | |
4877 ABS( p1 - p0 ) < beta && | |
4878 ABS( q1 - q0 ) < beta ) { | |
4879 const int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
4880 | |
4881 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ | |
4882 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
4883 } | |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4884 pix += stride; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4885 } |
1898 | 4886 }else{ |
4887 /* 2px edge length (because we use same bS than the one for luma) */ | |
4888 for( d = 0; d < 2; d++ ){ | |
4889 const int p0 = pix[-1]; | |
4890 const int p1 = pix[-2]; | |
4891 const int q0 = pix[0]; | |
4892 const int q1 = pix[1]; | |
4893 | |
4894 if( ABS( p0 - q0 ) < alpha && | |
4895 ABS( p1 - p0 ) < beta && | |
4896 ABS( q1 - q0 ) < beta ) { | |
4897 | |
4898 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */ | |
4899 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ | |
4900 } | |
4901 pix += stride; | |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4902 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4903 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4904 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4905 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4906 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4907 static void filter_mb_edgeh( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4908 int i, d; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4909 const int index_a = clip( qp + h->slice_alpha_c0_offset, 0, 51 ); |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4910 const int alpha = alpha_table[index_a]; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4911 const int beta = beta_table[clip( qp + h->slice_beta_offset, 0, 51 )]; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4912 const int pix_next = stride; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4913 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4914 for( i = 0; i < 4; i++ ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4915 if( bS[i] == 0 ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4916 pix += 4; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4917 continue; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4918 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4919 |
1898 | 4920 if( bS[i] < 4 ) { |
4921 const int tc0 = tc0_table[index_a][bS[i] - 1]; | |
4922 /* 4px edge length */ | |
4923 for( d = 0; d < 4; d++ ) { | |
4924 const int p0 = pix[-1*pix_next]; | |
4925 const int p1 = pix[-2*pix_next]; | |
4926 const int p2 = pix[-3*pix_next]; | |
4927 const int q0 = pix[0]; | |
4928 const int q1 = pix[1*pix_next]; | |
4929 const int q2 = pix[2*pix_next]; | |
4930 | |
4931 if( ABS( p0 - q0 ) < alpha && | |
4932 ABS( p1 - p0 ) < beta && | |
4933 ABS( q1 - q0 ) < beta ) { | |
4934 | |
4935 int tc = tc0; | |
4936 int i_delta; | |
4937 | |
4938 if( ABS( p2 - p0 ) < beta ) { | |
4939 pix[-2*pix_next] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); | |
4940 tc++; | |
4941 } | |
4942 if( ABS( q2 - q0 ) < beta ) { | |
4943 pix[pix_next] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); | |
4944 tc++; | |
4945 } | |
4946 | |
4947 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
4948 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */ | |
4949 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4950 } |
1898 | 4951 pix++; |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4952 } |
1898 | 4953 }else{ |
4954 /* 4px edge length */ | |
4955 for( d = 0; d < 4; d++ ) { | |
4956 const int p0 = pix[-1*pix_next]; | |
4957 const int p1 = pix[-2*pix_next]; | |
4958 const int p2 = pix[-3*pix_next]; | |
4959 const int q0 = pix[0]; | |
4960 const int q1 = pix[1*pix_next]; | |
4961 const int q2 = pix[2*pix_next]; | |
4962 | |
4963 if( ABS( p0 - q0 ) < alpha && | |
4964 ABS( p1 - p0 ) < beta && | |
4965 ABS( q1 - q0 ) < beta ) { | |
4966 | |
4967 const int p3 = pix[-4*pix_next]; | |
4968 const int q3 = pix[ 3*pix_next]; | |
4969 | |
4970 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
4971 if( ABS( p2 - p0 ) < beta) { | |
4972 /* p0', p1', p2' */ | |
4973 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
4974 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
4975 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
4976 } else { | |
4977 /* p0' */ | |
4978 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
4979 } | |
4980 if( ABS( q2 - q0 ) < beta) { | |
4981 /* q0', q1', q2' */ | |
4982 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
4983 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
4984 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
4985 } else { | |
4986 /* q0' */ | |
4987 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
4988 } | |
4989 }else{ | |
4990 /* p0', q0' */ | |
4991 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
4992 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
4993 } | |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4994 } |
1898 | 4995 pix++; |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4996 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4997 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4998 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4999 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5000 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5001 static void filter_mb_edgech( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5002 int i, d; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5003 const int index_a = clip( qp + h->slice_alpha_c0_offset, 0, 51 ); |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5004 const int alpha = alpha_table[index_a]; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5005 const int beta = beta_table[clip( qp + h->slice_beta_offset, 0, 51 )]; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5006 const int pix_next = stride; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5007 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5008 for( i = 0; i < 4; i++ ) |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5009 { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5010 if( bS[i] == 0 ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5011 pix += 2; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5012 continue; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5013 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5014 |
1898 | 5015 if( bS[i] < 4 ) { |
5016 int tc = tc0_table[index_a][bS[i] - 1] + 1; | |
5017 /* 2px edge length (see deblocking_filter_edgecv) */ | |
5018 for( d = 0; d < 2; d++ ) { | |
5019 const int p0 = pix[-1*pix_next]; | |
5020 const int p1 = pix[-2*pix_next]; | |
5021 const int q0 = pix[0]; | |
5022 const int q1 = pix[1*pix_next]; | |
5023 | |
5024 if( ABS( p0 - q0 ) < alpha && | |
5025 ABS( p1 - p0 ) < beta && | |
5026 ABS( q1 - q0 ) < beta ) { | |
5027 | |
5028 int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
5029 | |
5030 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */ | |
5031 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
5032 } | |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5033 pix++; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5034 } |
1898 | 5035 }else{ |
5036 /* 2px edge length (see deblocking_filter_edgecv) */ | |
5037 for( d = 0; d < 2; d++ ) { | |
5038 const int p0 = pix[-1*pix_next]; | |
5039 const int p1 = pix[-2*pix_next]; | |
5040 const int q0 = pix[0]; | |
5041 const int q1 = pix[1*pix_next]; | |
5042 | |
5043 if( ABS( p0 - q0 ) < alpha && | |
5044 ABS( p1 - p0 ) < beta && | |
5045 ABS( q1 - q0 ) < beta ) { | |
5046 | |
5047 pix[-pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */ | |
5048 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ | |
5049 } | |
5050 pix++; | |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5051 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5052 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5053 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5054 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5055 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5056 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr) { |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5057 MpegEncContext * const s = &h->s; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5058 const int mb_xy= mb_x + mb_y*s->mb_stride; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5059 int linesize, uvlinesize; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5060 int dir; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5061 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5062 /* FIXME Implement deblocking filter for field MB */ |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5063 if( h->sps.mb_aff ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5064 return; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5065 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5066 linesize = s->linesize; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5067 uvlinesize = s->uvlinesize; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5068 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5069 /* dir : 0 -> vertical edge, 1 -> horizontal edge */ |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5070 for( dir = 0; dir < 2; dir++ ) |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5071 { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5072 int start = 0; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5073 int edge; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5074 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5075 /* test picture boundary */ |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5076 if( ( dir == 0 && mb_x == 0 ) || ( dir == 1 && mb_y == 0 ) ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5077 start = 1; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5078 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5079 /* FIXME test slice boundary */ |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5080 if( h->deblocking_filter == 2 ) { |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5081 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5082 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5083 /* Calculate bS */ |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5084 for( edge = start; edge < 4; edge++ ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5085 /* mbn_xy: neighbour macroblock (how that works for field ?) */ |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5086 int mbn_xy = edge > 0 ? mb_xy : ( dir == 0 ? mb_xy -1 : mb_xy - s->mb_stride ); |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5087 int bS[4]; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5088 int qp; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5089 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5090 if( IS_INTRA( s->current_picture.mb_type[mb_xy] ) || |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5091 IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5092 bS[0] = bS[1] = bS[2] = bS[3] = ( edge == 0 ? 4 : 3 ); |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5093 } else { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5094 int i; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5095 for( i = 0; i < 4; i++ ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5096 int x = dir == 0 ? edge : i; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5097 int y = dir == 0 ? i : edge; |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5098 int b_idx= 8 + 4 + x + 8*y; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5099 int bn_idx= b_idx - (dir ? 8:1); |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5100 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5101 if( h->non_zero_count_cache[b_idx] != 0 || |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5102 h->non_zero_count_cache[bn_idx] != 0 ) { |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5103 bS[i] = 2; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5104 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5105 else if( h->slice_type == P_TYPE ) { |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5106 if( h->ref_cache[0][b_idx] != h->ref_cache[0][bn_idx] || |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5107 ABS( h->mv_cache[0][b_idx][0] - h->mv_cache[0][bn_idx][0] ) >= 4 || |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5108 ABS( h->mv_cache[0][b_idx][1] - h->mv_cache[0][bn_idx][1] ) >= 4 ) |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5109 bS[i] = 1; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5110 else |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5111 bS[i] = 0; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5112 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5113 else { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5114 /* FIXME Add support for B frame */ |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5115 return; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5116 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5117 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5118 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5119 if(bS[0]+bS[1]+bS[2]+bS[3] == 0) |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5120 continue; |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5121 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5122 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5123 /* Filter edge */ |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5124 qp = ( s->qscale + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1; |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5125 if( dir == 0 ) { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5126 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp ); |
1898 | 5127 if( (edge&1) == 0 ) { |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5128 int chroma_qp = ( h->chroma_qp + |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5129 get_chroma_qp( h, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5130 filter_mb_edgecv( h, &img_cb[2*edge], uvlinesize, bS, chroma_qp ); |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5131 filter_mb_edgecv( h, &img_cr[2*edge], uvlinesize, bS, chroma_qp ); |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5132 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5133 } else { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5134 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp ); |
1898 | 5135 if( (edge&1) == 0 ) { |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5136 int chroma_qp = ( h->chroma_qp + |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5137 get_chroma_qp( h, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5138 filter_mb_edgech( h, &img_cb[2*edge*uvlinesize], uvlinesize, bS, chroma_qp ); |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5139 filter_mb_edgech( h, &img_cr[2*edge*uvlinesize], uvlinesize, bS, chroma_qp ); |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5140 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5141 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5142 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5143 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5144 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5145 |
1168 | 5146 static int decode_slice(H264Context *h){ |
5147 MpegEncContext * const s = &h->s; | |
5148 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; | |
5149 | |
5150 s->mb_skip_run= -1; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5151 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5152 if( h->pps.cabac ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5153 int i; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5154 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5155 /* realign */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5156 align_get_bits( &s->gb ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5157 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5158 /* init cabac */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5159 ff_init_cabac_states( &h->cabac, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64 ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5160 ff_init_cabac_decoder( &h->cabac, |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5161 s->gb.buffer + get_bits_count(&s->gb)/8, |
2116 | 5162 ( s->gb.size_in_bits - get_bits_count(&s->gb) + 7)/8); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5163 /* calculate pre-state */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5164 for( i= 0; i < 399; i++ ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5165 int pre; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5166 if( h->slice_type == I_TYPE ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5167 pre = clip( ((cabac_context_init_I[i][0] * s->qscale) >>4 ) + cabac_context_init_I[i][1], 1, 126 ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5168 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5169 pre = clip( ((cabac_context_init_PB[h->cabac_init_idc][i][0] * s->qscale) >>4 ) + cabac_context_init_PB[h->cabac_init_idc][i][1], 1, 126 ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5170 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5171 if( pre <= 63 ) |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5172 h->cabac_state[i] = 2 * ( 63 - pre ) + 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5173 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5174 h->cabac_state[i] = 2 * ( pre - 64 ) + 1; |
1168 | 5175 } |
5176 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5177 for(;;){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5178 int ret = decode_mb_cabac(h); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5179 int eos = get_cabac_terminate( &h->cabac ); /* End of Slice flag */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5180 |
2163 | 5181 if(ret>=0) hl_decode_mb(h); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5182 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5183 /* XXX: useless as decode_mb_cabac it doesn't support that ... */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5184 if( ret >= 0 && h->sps.mb_aff ) { //FIXME optimal? or let mb_decode decode 16x32 ? |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5185 s->mb_y++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5186 |
2163 | 5187 if(ret>=0) ret = decode_mb_cabac(h); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5188 eos = get_cabac_terminate( &h->cabac ); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5189 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5190 hl_decode_mb(h); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5191 s->mb_y--; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5192 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5193 |
2116 | 5194 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 1) { |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5195 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5196 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5197 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5198 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5199 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5200 if( ++s->mb_x >= s->mb_width ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5201 s->mb_x = 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5202 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5203 if( ++s->mb_y >= s->mb_height ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5204 tprintf("slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5205 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5206 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5207 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5208 if( eos || s->mb_y >= s->mb_height ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5209 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5210 return 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5211 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5212 #if 0 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5213 /* TODO test over-reading in cabac code */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5214 else if( read too much in h->cabac ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5215 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5216 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5217 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5218 #endif |
1168 | 5219 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5220 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5221 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5222 for(;;){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5223 int ret = decode_mb_cavlc(h); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5224 |
2163 | 5225 if(ret>=0) hl_decode_mb(h); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5226 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5227 if(ret>=0 && h->sps.mb_aff){ //FIXME optimal? or let mb_decode decode 16x32 ? |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5228 s->mb_y++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5229 ret = decode_mb_cavlc(h); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5230 |
2163 | 5231 if(ret>=0) hl_decode_mb(h); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5232 s->mb_y--; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5233 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5234 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5235 if(ret<0){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5236 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5237 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5238 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5239 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5240 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5241 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5242 if(++s->mb_x >= s->mb_width){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5243 s->mb_x=0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5244 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5245 if(++s->mb_y >= s->mb_height){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5246 tprintf("slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5247 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5248 if(get_bits_count(&s->gb) == s->gb.size_in_bits ) { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5249 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5250 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5251 return 0; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5252 }else{ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5253 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5254 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5255 return -1; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5256 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5257 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5258 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5259 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5260 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5261 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){ |
1168 | 5262 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); |
5263 | |
5264 return 0; | |
5265 }else{ | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5266 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask); |
1168 | 5267 |
5268 return -1; | |
5269 } | |
5270 } | |
5271 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5272 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5273 |
1168 | 5274 #if 0 |
5275 for(;s->mb_y < s->mb_height; s->mb_y++){ | |
5276 for(;s->mb_x < s->mb_width; s->mb_x++){ | |
5277 int ret= decode_mb(h); | |
5278 | |
5279 hl_decode_mb(h); | |
5280 | |
5281 if(ret<0){ | |
5282 fprintf(stderr, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); | |
5283 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask); | |
5284 | |
5285 return -1; | |
5286 } | |
5287 | |
5288 if(++s->mb_x >= s->mb_width){ | |
5289 s->mb_x=0; | |
5290 if(++s->mb_y >= s->mb_height){ | |
5291 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
5292 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); | |
5293 | |
5294 return 0; | |
5295 }else{ | |
5296 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); | |
5297 | |
5298 return -1; | |
5299 } | |
5300 } | |
5301 } | |
5302 | |
5303 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){ | |
5304 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
5305 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask); | |
5306 | |
5307 return 0; | |
5308 }else{ | |
5309 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask); | |
5310 | |
5311 return -1; | |
5312 } | |
5313 } | |
5314 } | |
5315 s->mb_x=0; | |
5316 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
5317 } | |
5318 #endif | |
5319 return -1; //not reached | |
5320 } | |
5321 | |
5322 static inline int decode_vui_parameters(H264Context *h, SPS *sps){ | |
5323 MpegEncContext * const s = &h->s; | |
5324 int aspect_ratio_info_present_flag, aspect_ratio_idc; | |
5325 | |
5326 aspect_ratio_info_present_flag= get_bits1(&s->gb); | |
5327 | |
5328 if( aspect_ratio_info_present_flag ) { | |
5329 aspect_ratio_idc= get_bits(&s->gb, 8); | |
5330 if( aspect_ratio_idc == EXTENDED_SAR ) { | |
1548 | 5331 sps->sar.num= get_bits(&s->gb, 16); |
5332 sps->sar.den= get_bits(&s->gb, 16); | |
1168 | 5333 }else if(aspect_ratio_idc < 16){ |
1548 | 5334 sps->sar= pixel_aspect[aspect_ratio_idc]; |
1168 | 5335 }else{ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5336 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n"); |
1168 | 5337 return -1; |
5338 } | |
5339 }else{ | |
1548 | 5340 sps->sar.num= |
5341 sps->sar.den= 0; | |
1168 | 5342 } |
5343 // s->avctx->aspect_ratio= sar_width*s->width / (float)(s->height*sar_height); | |
2174
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5344 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5345 if(get_bits1(&s->gb)){ /* overscan_info_present_flag */ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5346 get_bits1(&s->gb); /* overscan_appropriate_flag */ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5347 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5348 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5349 if(get_bits1(&s->gb)){ /* video_signal_type_present_flag */ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5350 get_bits(&s->gb, 3); /* video_format */ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5351 get_bits1(&s->gb); /* video_full_range_flag */ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5352 if(get_bits1(&s->gb)){ /* colour_description_present_flag */ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5353 get_bits(&s->gb, 8); /* colour_primaries */ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5354 get_bits(&s->gb, 8); /* transfer_characteristics */ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5355 get_bits(&s->gb, 8); /* matrix_coefficients */ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5356 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5357 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5358 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5359 if(get_bits1(&s->gb)){ /* chroma_location_info_present_flag */ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5360 get_ue_golomb(&s->gb); /* chroma_sample_location_type_top_field */ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5361 get_ue_golomb(&s->gb); /* chroma_sample_location_type_bottom_field */ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5362 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5363 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5364 sps->timing_info_present_flag = get_bits1(&s->gb); |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5365 if(sps->timing_info_present_flag){ |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5366 sps->num_units_in_tick = get_bits_long(&s->gb, 32); |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5367 sps->time_scale = get_bits_long(&s->gb, 32); |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5368 sps->fixed_frame_rate_flag = get_bits1(&s->gb); |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5369 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5370 |
1168 | 5371 #if 0 |
5372 | nal_hrd_parameters_present_flag |0 |u(1) | | |
5373 | if( nal_hrd_parameters_present_flag = = 1) | | | | |
5374 | hrd_parameters( ) | | | | |
5375 | vcl_hrd_parameters_present_flag |0 |u(1) | | |
5376 | if( vcl_hrd_parameters_present_flag = = 1) | | | | |
5377 | hrd_parameters( ) | | | | |
5378 | if( ( nal_hrd_parameters_present_flag = = 1 | || | | | |
5379 | | | | | |
5380 |( vcl_hrd_parameters_present_flag = = 1 ) ) | | | | |
5381 | low_delay_hrd_flag |0 |u(1) | | |
5382 | bitstream_restriction_flag |0 |u(1) | | |
5383 | if( bitstream_restriction_flag ) { |0 |u(1) | | |
5384 | motion_vectors_over_pic_boundaries_flag |0 |u(1) | | |
5385 | max_bytes_per_pic_denom |0 |ue(v) | | |
5386 | max_bits_per_mb_denom |0 |ue(v) | | |
5387 | log2_max_mv_length_horizontal |0 |ue(v) | | |
5388 | log2_max_mv_length_vertical |0 |ue(v) | | |
5389 | num_reorder_frames |0 |ue(v) | | |
5390 | max_dec_frame_buffering |0 |ue(v) | | |
5391 | } | | | | |
5392 |} | | | | |
5393 #endif | |
5394 return 0; | |
5395 } | |
5396 | |
5397 static inline int decode_seq_parameter_set(H264Context *h){ | |
5398 MpegEncContext * const s = &h->s; | |
1371 | 5399 int profile_idc, level_idc; |
1168 | 5400 int sps_id, i; |
5401 SPS *sps; | |
5402 | |
5403 profile_idc= get_bits(&s->gb, 8); | |
1371 | 5404 get_bits1(&s->gb); //constraint_set0_flag |
5405 get_bits1(&s->gb); //constraint_set1_flag | |
5406 get_bits1(&s->gb); //constraint_set2_flag | |
5407 get_bits(&s->gb, 5); // reserved | |
1168 | 5408 level_idc= get_bits(&s->gb, 8); |
5409 sps_id= get_ue_golomb(&s->gb); | |
5410 | |
5411 sps= &h->sps_buffer[ sps_id ]; | |
5412 sps->profile_idc= profile_idc; | |
5413 sps->level_idc= level_idc; | |
5414 | |
5415 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4; | |
5416 sps->poc_type= get_ue_golomb(&s->gb); | |
5417 | |
5418 if(sps->poc_type == 0){ //FIXME #define | |
5419 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4; | |
5420 } else if(sps->poc_type == 1){//FIXME #define | |
5421 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb); | |
5422 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb); | |
5423 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb); | |
5424 sps->poc_cycle_length= get_ue_golomb(&s->gb); | |
5425 | |
5426 for(i=0; i<sps->poc_cycle_length; i++) | |
5427 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb); | |
5428 } | |
5429 if(sps->poc_type > 2){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5430 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type); |
1168 | 5431 return -1; |
5432 } | |
5433 | |
5434 sps->ref_frame_count= get_ue_golomb(&s->gb); | |
2254
0dfe4e32b19c
H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2227
diff
changeset
|
5435 if(sps->ref_frame_count > MAX_PICTURE_COUNT-2){ |
0dfe4e32b19c
H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2227
diff
changeset
|
5436 av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n"); |
0dfe4e32b19c
H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2227
diff
changeset
|
5437 } |
1371 | 5438 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb); |
1168 | 5439 sps->mb_width= get_ue_golomb(&s->gb) + 1; |
5440 sps->mb_height= get_ue_golomb(&s->gb) + 1; | |
5441 sps->frame_mbs_only_flag= get_bits1(&s->gb); | |
5442 if(!sps->frame_mbs_only_flag) | |
5443 sps->mb_aff= get_bits1(&s->gb); | |
5444 else | |
5445 sps->mb_aff= 0; | |
5446 | |
5447 sps->direct_8x8_inference_flag= get_bits1(&s->gb); | |
5448 | |
1371 | 5449 sps->crop= get_bits1(&s->gb); |
5450 if(sps->crop){ | |
5451 sps->crop_left = get_ue_golomb(&s->gb); | |
5452 sps->crop_right = get_ue_golomb(&s->gb); | |
5453 sps->crop_top = get_ue_golomb(&s->gb); | |
5454 sps->crop_bottom= get_ue_golomb(&s->gb); | |
5455 if(sps->crop_left || sps->crop_top){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5456 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completly supported, this could look slightly wrong ...\n"); |
1371 | 5457 } |
5458 }else{ | |
5459 sps->crop_left = | |
5460 sps->crop_right = | |
5461 sps->crop_top = | |
5462 sps->crop_bottom= 0; | |
5463 } | |
5464 | |
1168 | 5465 sps->vui_parameters_present_flag= get_bits1(&s->gb); |
5466 if( sps->vui_parameters_present_flag ) | |
5467 decode_vui_parameters(h, sps); | |
5468 | |
5469 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5470 av_log(h->s.avctx, AV_LOG_DEBUG, "sps:%d profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s\n", |
1168 | 5471 sps_id, sps->profile_idc, sps->level_idc, |
5472 sps->poc_type, | |
5473 sps->ref_frame_count, | |
5474 sps->mb_width, sps->mb_height, | |
5475 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"), | |
5476 sps->direct_8x8_inference_flag ? "8B8" : "", | |
1371 | 5477 sps->crop_left, sps->crop_right, |
5478 sps->crop_top, sps->crop_bottom, | |
1168 | 5479 sps->vui_parameters_present_flag ? "VUI" : "" |
5480 ); | |
5481 } | |
5482 return 0; | |
5483 } | |
5484 | |
5485 static inline int decode_picture_parameter_set(H264Context *h){ | |
5486 MpegEncContext * const s = &h->s; | |
5487 int pps_id= get_ue_golomb(&s->gb); | |
5488 PPS *pps= &h->pps_buffer[pps_id]; | |
5489 | |
5490 pps->sps_id= get_ue_golomb(&s->gb); | |
5491 pps->cabac= get_bits1(&s->gb); | |
5492 pps->pic_order_present= get_bits1(&s->gb); | |
5493 pps->slice_group_count= get_ue_golomb(&s->gb) + 1; | |
5494 if(pps->slice_group_count > 1 ){ | |
5495 pps->mb_slice_group_map_type= get_ue_golomb(&s->gb); | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5496 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n"); |
1168 | 5497 switch(pps->mb_slice_group_map_type){ |
5498 case 0: | |
5499 #if 0 | |
5500 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | | | |
5501 | run_length[ i ] |1 |ue(v) | | |
5502 #endif | |
5503 break; | |
5504 case 2: | |
5505 #if 0 | |
5506 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | | | |
5507 |{ | | | | |
5508 | top_left_mb[ i ] |1 |ue(v) | | |
5509 | bottom_right_mb[ i ] |1 |ue(v) | | |
5510 | } | | | | |
5511 #endif | |
5512 break; | |
5513 case 3: | |
5514 case 4: | |
5515 case 5: | |
5516 #if 0 | |
5517 | slice_group_change_direction_flag |1 |u(1) | | |
5518 | slice_group_change_rate_minus1 |1 |ue(v) | | |
5519 #endif | |
5520 break; | |
5521 case 6: | |
5522 #if 0 | |
5523 | slice_group_id_cnt_minus1 |1 |ue(v) | | |
5524 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | | | |
5525 |) | | | | |
5526 | slice_group_id[ i ] |1 |u(v) | | |
5527 #endif | |
1214 | 5528 break; |
1168 | 5529 } |
5530 } | |
5531 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
5532 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
5533 if(pps->ref_count[0] > 32 || pps->ref_count[1] > 32){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5534 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n"); |
1168 | 5535 return -1; |
5536 } | |
5537 | |
5538 pps->weighted_pred= get_bits1(&s->gb); | |
5539 pps->weighted_bipred_idc= get_bits(&s->gb, 2); | |
5540 pps->init_qp= get_se_golomb(&s->gb) + 26; | |
5541 pps->init_qs= get_se_golomb(&s->gb) + 26; | |
5542 pps->chroma_qp_index_offset= get_se_golomb(&s->gb); | |
5543 pps->deblocking_filter_parameters_present= get_bits1(&s->gb); | |
5544 pps->constrained_intra_pred= get_bits1(&s->gb); | |
5545 pps->redundant_pic_cnt_present = get_bits1(&s->gb); | |
5546 | |
5547 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5548 av_log(h->s.avctx, AV_LOG_DEBUG, "pps:%d sps:%d %s slice_groups:%d ref:%d/%d %s qp:%d/%d/%d %s %s %s\n", |
1168 | 5549 pps_id, pps->sps_id, |
5550 pps->cabac ? "CABAC" : "CAVLC", | |
5551 pps->slice_group_count, | |
5552 pps->ref_count[0], pps->ref_count[1], | |
5553 pps->weighted_pred ? "weighted" : "", | |
5554 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset, | |
5555 pps->deblocking_filter_parameters_present ? "LPAR" : "", | |
5556 pps->constrained_intra_pred ? "CONSTR" : "", | |
1371 | 5557 pps->redundant_pic_cnt_present ? "REDU" : "" |
1168 | 5558 ); |
5559 } | |
5560 | |
5561 return 0; | |
5562 } | |
5563 | |
5564 /** | |
5565 * finds the end of the current frame in the bitstream. | |
5566 * @return the position of the first byte of the next frame, or -1 | |
5567 */ | |
1988 | 5568 static int find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){ |
1187 | 5569 int i; |
1168 | 5570 uint32_t state; |
5571 //printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]); | |
5572 // mb_addr= pc->mb_addr - 1; | |
5573 state= pc->state; | |
5574 //FIXME this will fail with slices | |
5575 for(i=0; i<buf_size; i++){ | |
5576 state= (state<<8) | buf[i]; | |
5577 if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){ | |
5578 if(pc->frame_start_found){ | |
5579 pc->state=-1; | |
5580 pc->frame_start_found= 0; | |
5581 return i-3; | |
5582 } | |
5583 pc->frame_start_found= 1; | |
5584 } | |
5585 } | |
5586 | |
5587 pc->state= state; | |
1219 | 5588 return END_NOT_FOUND; |
1168 | 5589 } |
5590 | |
1988 | 5591 static int h264_parse(AVCodecParserContext *s, |
5592 AVCodecContext *avctx, | |
5593 uint8_t **poutbuf, int *poutbuf_size, | |
5594 const uint8_t *buf, int buf_size) | |
5595 { | |
5596 ParseContext *pc = s->priv_data; | |
5597 int next; | |
5598 | |
5599 next= find_frame_end(pc, buf, buf_size); | |
5600 | |
5601 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { | |
5602 *poutbuf = NULL; | |
5603 *poutbuf_size = 0; | |
5604 return buf_size; | |
5605 } | |
5606 | |
5607 *poutbuf = (uint8_t *)buf; | |
5608 *poutbuf_size = buf_size; | |
5609 return next; | |
5610 } | |
5611 | |
1168 | 5612 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ |
5613 MpegEncContext * const s = &h->s; | |
5614 AVCodecContext * const avctx= s->avctx; | |
5615 int buf_index=0; | |
1322 | 5616 #if 0 |
1168 | 5617 int i; |
5618 for(i=0; i<32; i++){ | |
5619 printf("%X ", buf[i]); | |
5620 } | |
5621 #endif | |
5622 for(;;){ | |
5623 int consumed; | |
5624 int dst_length; | |
5625 int bit_length; | |
5626 uint8_t *ptr; | |
2227 | 5627 int i, nalsize = 0; |
1168 | 5628 |
2227 | 5629 if(h->is_avc) { |
5630 if(buf_index >= buf_size) break; | |
5631 nalsize = 0; | |
5632 for(i = 0; i < h->nal_length_size; i++) | |
5633 nalsize = (nalsize << 8) | buf[buf_index++]; | |
5634 } else { | |
1168 | 5635 // start code prefix search |
5636 for(; buf_index + 3 < buf_size; buf_index++){ | |
5637 // this should allways succeed in the first iteration | |
5638 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | |
5639 break; | |
5640 } | |
5641 | |
5642 if(buf_index+3 >= buf_size) break; | |
5643 | |
5644 buf_index+=3; | |
2227 | 5645 } |
1168 | 5646 |
5647 ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, buf_size - buf_index); | |
5648 if(ptr[dst_length - 1] == 0) dst_length--; | |
5649 bit_length= 8*dst_length - decode_rbsp_trailing(ptr + dst_length - 1); | |
5650 | |
5651 if(s->avctx->debug&FF_DEBUG_STARTCODE){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5652 av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d length %d\n", h->nal_unit_type, buf_index, dst_length); |
1168 | 5653 } |
5654 | |
2227 | 5655 if (h->is_avc && (nalsize != consumed)) |
5656 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); | |
5657 | |
1168 | 5658 buf_index += consumed; |
5659 | |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
5660 if( s->hurry_up == 1 && h->nal_ref_idc == 0 ) |
1168 | 5661 continue; |
5662 | |
5663 switch(h->nal_unit_type){ | |
5664 case NAL_IDR_SLICE: | |
5665 idr(h); //FIXME ensure we dont loose some frames if there is reordering | |
5666 case NAL_SLICE: | |
5667 init_get_bits(&s->gb, ptr, bit_length); | |
5668 h->intra_gb_ptr= | |
5669 h->inter_gb_ptr= &s->gb; | |
5670 s->data_partitioning = 0; | |
5671 | |
5672 if(decode_slice_header(h) < 0) return -1; | |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
5673 if(h->redundant_pic_count==0 && s->hurry_up < 5 ) |
1168 | 5674 decode_slice(h); |
5675 break; | |
5676 case NAL_DPA: | |
5677 init_get_bits(&s->gb, ptr, bit_length); | |
5678 h->intra_gb_ptr= | |
5679 h->inter_gb_ptr= NULL; | |
5680 s->data_partitioning = 1; | |
5681 | |
5682 if(decode_slice_header(h) < 0) return -1; | |
5683 break; | |
5684 case NAL_DPB: | |
5685 init_get_bits(&h->intra_gb, ptr, bit_length); | |
5686 h->intra_gb_ptr= &h->intra_gb; | |
5687 break; | |
5688 case NAL_DPC: | |
5689 init_get_bits(&h->inter_gb, ptr, bit_length); | |
5690 h->inter_gb_ptr= &h->inter_gb; | |
1174 | 5691 |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
5692 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning && s->hurry_up < 5 ) |
1168 | 5693 decode_slice(h); |
5694 break; | |
5695 case NAL_SEI: | |
5696 break; | |
5697 case NAL_SPS: | |
5698 init_get_bits(&s->gb, ptr, bit_length); | |
5699 decode_seq_parameter_set(h); | |
5700 | |
5701 if(s->flags& CODEC_FLAG_LOW_DELAY) | |
5702 s->low_delay=1; | |
5703 | |
5704 avctx->has_b_frames= !s->low_delay; | |
5705 break; | |
5706 case NAL_PPS: | |
5707 init_get_bits(&s->gb, ptr, bit_length); | |
5708 | |
5709 decode_picture_parameter_set(h); | |
5710 | |
5711 break; | |
5712 case NAL_PICTURE_DELIMITER: | |
5713 break; | |
5714 case NAL_FILTER_DATA: | |
5715 break; | |
2099 | 5716 default: |
5717 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type); | |
1168 | 5718 } |
5719 | |
5720 //FIXME move after where irt is set | |
5721 s->current_picture.pict_type= s->pict_type; | |
5722 s->current_picture.key_frame= s->pict_type == I_TYPE; | |
5723 } | |
5724 | |
1174 | 5725 if(!s->current_picture_ptr) return buf_index; //no frame |
5726 | |
1168 | 5727 h->prev_frame_num_offset= h->frame_num_offset; |
5728 h->prev_frame_num= h->frame_num; | |
5729 if(s->current_picture_ptr->reference){ | |
5730 h->prev_poc_msb= h->poc_msb; | |
5731 h->prev_poc_lsb= h->poc_lsb; | |
5732 } | |
5733 if(s->current_picture_ptr->reference) | |
5734 execute_ref_pic_marking(h, h->mmco, h->mmco_index); | |
5735 else | |
1169 | 5736 assert(h->mmco_index==0); |
1168 | 5737 |
5738 ff_er_frame_end(s); | |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5739 |
1168 | 5740 MPV_frame_end(s); |
5741 | |
5742 return buf_index; | |
5743 } | |
5744 | |
5745 /** | |
5746 * retunrs the number of bytes consumed for building the current frame | |
5747 */ | |
5748 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){ | |
5749 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
5750 pos -= s->parse_context.last_index; | |
5751 if(pos<0) pos=0; // FIXME remove (uneeded?) | |
5752 | |
5753 return pos; | |
5754 }else{ | |
5755 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...) | |
5756 if(pos+10>buf_size) pos=buf_size; // oops ;) | |
5757 | |
5758 return pos; | |
5759 } | |
5760 } | |
5761 | |
5762 static int decode_frame(AVCodecContext *avctx, | |
5763 void *data, int *data_size, | |
5764 uint8_t *buf, int buf_size) | |
5765 { | |
5766 H264Context *h = avctx->priv_data; | |
5767 MpegEncContext *s = &h->s; | |
5768 AVFrame *pict = data; | |
5769 int buf_index; | |
5770 | |
5771 s->flags= avctx->flags; | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1706
diff
changeset
|
5772 s->flags2= avctx->flags2; |
1168 | 5773 |
5774 /* no supplementary picture */ | |
5775 if (buf_size == 0) { | |
5776 return 0; | |
5777 } | |
5778 | |
5779 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
1988 | 5780 int next= find_frame_end(&s->parse_context, buf, buf_size); |
1168 | 5781 |
1988 | 5782 if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 ) |
1168 | 5783 return buf_size; |
5784 //printf("next:%d buf_size:%d last_index:%d\n", next, buf_size, s->parse_context.last_index); | |
5785 } | |
5786 | |
2227 | 5787 if(h->is_avc && !h->got_avcC) { |
5788 int i, cnt, nalsize; | |
5789 unsigned char *p = avctx->extradata; | |
5790 if(avctx->extradata_size < 7) { | |
5791 av_log(avctx, AV_LOG_ERROR, "avcC too short\n"); | |
5792 return -1; | |
5793 } | |
5794 if(*p != 1) { | |
5795 av_log(avctx, AV_LOG_ERROR, "Unknown avcC version %d\n", *p); | |
5796 return -1; | |
5797 } | |
5798 /* sps and pps in the avcC always have length coded with 2 bytes, | |
5799 so put a fake nal_length_size = 2 while parsing them */ | |
5800 h->nal_length_size = 2; | |
5801 // Decode sps from avcC | |
5802 cnt = *(p+5) & 0x1f; // Number of sps | |
5803 p += 6; | |
5804 for (i = 0; i < cnt; i++) { | |
5805 nalsize = BE_16(p) + 2; | |
5806 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
5807 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); | |
5808 return -1; | |
5809 } | |
5810 p += nalsize; | |
5811 } | |
5812 // Decode pps from avcC | |
5813 cnt = *(p++); // Number of pps | |
5814 for (i = 0; i < cnt; i++) { | |
5815 nalsize = BE_16(p) + 2; | |
5816 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
5817 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); | |
5818 return -1; | |
5819 } | |
5820 p += nalsize; | |
5821 } | |
5822 // Now store right nal length size, that will be use to parse all other nals | |
5823 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1; | |
5824 // Do not reparse avcC | |
5825 h->got_avcC = 1; | |
5826 } | |
5827 | |
5828 if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){ | |
1168 | 5829 if(0 < decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) ) |
5830 return -1; | |
5831 } | |
5832 | |
5833 buf_index=decode_nal_units(h, buf, buf_size); | |
5834 if(buf_index < 0) | |
5835 return -1; | |
5836 | |
5837 //FIXME do something with unavailable reference frames | |
5838 | |
5839 // if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_index, buf_size); | |
5840 #if 0 | |
5841 if(s->pict_type==B_TYPE || s->low_delay){ | |
5842 *pict= *(AVFrame*)&s->current_picture; | |
5843 } else { | |
5844 *pict= *(AVFrame*)&s->last_picture; | |
5845 } | |
5846 #endif | |
1174 | 5847 if(!s->current_picture_ptr){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5848 av_log(h->s.avctx, AV_LOG_DEBUG, "error, NO frame\n"); |
1174 | 5849 return -1; |
5850 } | |
5851 | |
1168 | 5852 *pict= *(AVFrame*)&s->current_picture; //FIXME |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1698
diff
changeset
|
5853 ff_print_debug_info(s, pict); |
1168 | 5854 assert(pict->data[0]); |
5855 //printf("out %d\n", (int)pict->data[0]); | |
5856 #if 0 //? | |
5857 | |
5858 /* Return the Picture timestamp as the frame number */ | |
5859 /* we substract 1 because it is added on utils.c */ | |
5860 avctx->frame_number = s->picture_number - 1; | |
5861 #endif | |
5862 #if 0 | |
5863 /* dont output the last pic after seeking */ | |
5864 if(s->last_picture_ptr || s->low_delay) | |
5865 //Note this isnt a issue as a IDR pic should flush teh buffers | |
5866 #endif | |
5867 *data_size = sizeof(AVFrame); | |
5868 return get_consumed_bytes(s, buf_index, buf_size); | |
5869 } | |
5870 #if 0 | |
5871 static inline void fill_mb_avail(H264Context *h){ | |
5872 MpegEncContext * const s = &h->s; | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
5873 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 5874 |
5875 if(s->mb_y){ | |
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
5876 h->mb_avail[0]= s->mb_x && h->slice_table[mb_xy - s->mb_stride - 1] == h->slice_num; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
5877 h->mb_avail[1]= h->slice_table[mb_xy - s->mb_stride ] == h->slice_num; |
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
5878 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num; |
1168 | 5879 }else{ |
5880 h->mb_avail[0]= | |
5881 h->mb_avail[1]= | |
5882 h->mb_avail[2]= 0; | |
5883 } | |
5884 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num; | |
5885 h->mb_avail[4]= 1; //FIXME move out | |
5886 h->mb_avail[5]= 0; //FIXME move out | |
5887 } | |
5888 #endif | |
5889 | |
5890 #if 0 //selftest | |
5891 #define COUNT 8000 | |
5892 #define SIZE (COUNT*40) | |
5893 int main(){ | |
5894 int i; | |
5895 uint8_t temp[SIZE]; | |
5896 PutBitContext pb; | |
5897 GetBitContext gb; | |
5898 // int int_temp[10000]; | |
5899 DSPContext dsp; | |
5900 AVCodecContext avctx; | |
5901 | |
5902 dsputil_init(&dsp, &avctx); | |
5903 | |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1453
diff
changeset
|
5904 init_put_bits(&pb, temp, SIZE); |
1168 | 5905 printf("testing unsigned exp golomb\n"); |
5906 for(i=0; i<COUNT; i++){ | |
5907 START_TIMER | |
5908 set_ue_golomb(&pb, i); | |
5909 STOP_TIMER("set_ue_golomb"); | |
5910 } | |
5911 flush_put_bits(&pb); | |
5912 | |
5913 init_get_bits(&gb, temp, 8*SIZE); | |
5914 for(i=0; i<COUNT; i++){ | |
5915 int j, s; | |
5916 | |
5917 s= show_bits(&gb, 24); | |
5918 | |
5919 START_TIMER | |
5920 j= get_ue_golomb(&gb); | |
5921 if(j != i){ | |
5922 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
5923 // return -1; | |
5924 } | |
5925 STOP_TIMER("get_ue_golomb"); | |
5926 } | |
5927 | |
5928 | |
1524 | 5929 init_put_bits(&pb, temp, SIZE); |
1168 | 5930 printf("testing signed exp golomb\n"); |
5931 for(i=0; i<COUNT; i++){ | |
5932 START_TIMER | |
5933 set_se_golomb(&pb, i - COUNT/2); | |
5934 STOP_TIMER("set_se_golomb"); | |
5935 } | |
5936 flush_put_bits(&pb); | |
5937 | |
5938 init_get_bits(&gb, temp, 8*SIZE); | |
5939 for(i=0; i<COUNT; i++){ | |
5940 int j, s; | |
5941 | |
5942 s= show_bits(&gb, 24); | |
5943 | |
5944 START_TIMER | |
5945 j= get_se_golomb(&gb); | |
5946 if(j != i - COUNT/2){ | |
5947 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
5948 // return -1; | |
5949 } | |
5950 STOP_TIMER("get_se_golomb"); | |
5951 } | |
5952 | |
5953 printf("testing 4x4 (I)DCT\n"); | |
5954 | |
5955 DCTELEM block[16]; | |
5956 uint8_t src[16], ref[16]; | |
5957 uint64_t error= 0, max_error=0; | |
5958 | |
5959 for(i=0; i<COUNT; i++){ | |
5960 int j; | |
5961 // printf("%d %d %d\n", r1, r2, (r2-r1)*16); | |
5962 for(j=0; j<16; j++){ | |
5963 ref[j]= random()%255; | |
5964 src[j]= random()%255; | |
5965 } | |
5966 | |
5967 h264_diff_dct_c(block, src, ref, 4); | |
5968 | |
5969 //normalize | |
5970 for(j=0; j<16; j++){ | |
5971 // printf("%d ", block[j]); | |
5972 block[j]= block[j]*4; | |
5973 if(j&1) block[j]= (block[j]*4 + 2)/5; | |
5974 if(j&4) block[j]= (block[j]*4 + 2)/5; | |
5975 } | |
5976 // printf("\n"); | |
5977 | |
5978 h264_add_idct_c(ref, block, 4); | |
5979 /* for(j=0; j<16; j++){ | |
5980 printf("%d ", ref[j]); | |
5981 } | |
5982 printf("\n");*/ | |
5983 | |
5984 for(j=0; j<16; j++){ | |
5985 int diff= ABS(src[j] - ref[j]); | |
5986 | |
5987 error+= diff*diff; | |
5988 max_error= FFMAX(max_error, diff); | |
5989 } | |
5990 } | |
5991 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error ); | |
5992 #if 0 | |
5993 printf("testing quantizer\n"); | |
5994 for(qp=0; qp<52; qp++){ | |
5995 for(i=0; i<16; i++) | |
5996 src1_block[i]= src2_block[i]= random()%255; | |
5997 | |
5998 } | |
5999 #endif | |
6000 printf("Testing NAL layer\n"); | |
6001 | |
6002 uint8_t bitstream[COUNT]; | |
6003 uint8_t nal[COUNT*2]; | |
6004 H264Context h; | |
6005 memset(&h, 0, sizeof(H264Context)); | |
6006 | |
6007 for(i=0; i<COUNT; i++){ | |
6008 int zeros= i; | |
6009 int nal_length; | |
6010 int consumed; | |
6011 int out_length; | |
6012 uint8_t *out; | |
6013 int j; | |
6014 | |
6015 for(j=0; j<COUNT; j++){ | |
6016 bitstream[j]= (random() % 255) + 1; | |
6017 } | |
6018 | |
6019 for(j=0; j<zeros; j++){ | |
6020 int pos= random() % COUNT; | |
6021 while(bitstream[pos] == 0){ | |
6022 pos++; | |
6023 pos %= COUNT; | |
6024 } | |
6025 bitstream[pos]=0; | |
6026 } | |
6027 | |
6028 START_TIMER | |
6029 | |
6030 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2); | |
6031 if(nal_length<0){ | |
6032 printf("encoding failed\n"); | |
6033 return -1; | |
6034 } | |
6035 | |
6036 out= decode_nal(&h, nal, &out_length, &consumed, nal_length); | |
6037 | |
6038 STOP_TIMER("NAL") | |
6039 | |
6040 if(out_length != COUNT){ | |
6041 printf("incorrect length %d %d\n", out_length, COUNT); | |
6042 return -1; | |
6043 } | |
6044 | |
6045 if(consumed != nal_length){ | |
6046 printf("incorrect consumed length %d %d\n", nal_length, consumed); | |
6047 return -1; | |
6048 } | |
6049 | |
6050 if(memcmp(bitstream, out, COUNT)){ | |
6051 printf("missmatch\n"); | |
6052 return -1; | |
6053 } | |
6054 } | |
6055 | |
6056 printf("Testing RBSP\n"); | |
6057 | |
6058 | |
6059 return 0; | |
6060 } | |
6061 #endif | |
6062 | |
6063 | |
6064 static int decode_end(AVCodecContext *avctx) | |
6065 { | |
6066 H264Context *h = avctx->priv_data; | |
6067 MpegEncContext *s = &h->s; | |
6068 | |
6069 free_tables(h); //FIXME cleanup init stuff perhaps | |
6070 MPV_common_end(s); | |
6071 | |
6072 // memset(h, 0, sizeof(H264Context)); | |
6073 | |
6074 return 0; | |
6075 } | |
6076 | |
6077 | |
6078 AVCodec h264_decoder = { | |
6079 "h264", | |
6080 CODEC_TYPE_VIDEO, | |
6081 CODEC_ID_H264, | |
6082 sizeof(H264Context), | |
6083 decode_init, | |
6084 NULL, | |
6085 decode_end, | |
6086 decode_frame, | |
1214 | 6087 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED, |
1168 | 6088 }; |
6089 | |
1988 | 6090 AVCodecParser h264_parser = { |
6091 { CODEC_ID_H264 }, | |
6092 sizeof(ParseContext), | |
6093 NULL, | |
6094 h264_parse, | |
6095 ff_parse_close, | |
6096 }; | |
6097 | |
1234 | 6098 #include "svq3.c" |