Mercurial > libavcodec.hg
annotate h264.c @ 2392:299f2d85d27d libavcodec
add multi slice support
for main profile H.264 streams. I have tested this on all H264
conformance streams and comparing the result with the current CVS
version, there is 8 streams which decode correctly more frames and 2
streams which are now completely correct with my patch.
This patch also correct some typo in comments.
patch by (Loic Le Loarer <lll+ffmpeg >at< m4x org>)
author | michael |
---|---|
date | Sat, 18 Dec 2004 03:49:07 +0000 |
parents | 6ffcdd96ae99 |
children | 81516be6d0e4 |
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; |
2314 | 310 int top_cbp; |
311 int left_cbp; | |
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
|
312 /* 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
|
313 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
|
314 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
|
315 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
|
316 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
|
317 |
1168 | 318 }H264Context; |
319 | |
320 static VLC coeff_token_vlc[4]; | |
321 static VLC chroma_dc_coeff_token_vlc; | |
322 | |
323 static VLC total_zeros_vlc[15]; | |
324 static VLC chroma_dc_total_zeros_vlc[3]; | |
325 | |
326 static VLC run_vlc[6]; | |
327 static VLC run7_vlc; | |
328 | |
1234 | 329 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); |
330 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
|
331 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 | 332 |
1269 | 333 static inline uint32_t pack16to32(int a, int b){ |
334 #ifdef WORDS_BIGENDIAN | |
335 return (b&0xFFFF) + (a<<16); | |
336 #else | |
337 return (a&0xFFFF) + (b<<16); | |
338 #endif | |
339 } | |
340 | |
1168 | 341 /** |
342 * fill a rectangle. | |
2392 | 343 * @param h height of the rectangle, should be a constant |
344 * @param w width of the rectangle, should be a constant | |
1168 | 345 * @param size the size of val (1 or 4), should be a constant |
346 */ | |
1187 | 347 static inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){ //FIXME ensure this IS inlined |
348 uint8_t *p= (uint8_t*)vp; | |
1168 | 349 assert(size==1 || size==4); |
350 | |
351 w *= size; | |
352 stride *= size; | |
353 | |
354 //FIXME check what gcc generates for 64 bit on x86 and possible write a 32 bit ver of it | |
355 if(w==2 && h==2){ | |
356 *(uint16_t*)(p + 0)= | |
357 *(uint16_t*)(p + stride)= size==4 ? val : val*0x0101; | |
358 }else if(w==2 && h==4){ | |
359 *(uint16_t*)(p + 0*stride)= | |
360 *(uint16_t*)(p + 1*stride)= | |
361 *(uint16_t*)(p + 2*stride)= | |
362 *(uint16_t*)(p + 3*stride)= size==4 ? val : val*0x0101; | |
1252 | 363 }else if(w==4 && h==1){ |
364 *(uint32_t*)(p + 0*stride)= size==4 ? val : val*0x01010101; | |
1168 | 365 }else if(w==4 && h==2){ |
366 *(uint32_t*)(p + 0*stride)= | |
367 *(uint32_t*)(p + 1*stride)= size==4 ? val : val*0x01010101; | |
368 }else if(w==4 && h==4){ | |
369 *(uint32_t*)(p + 0*stride)= | |
370 *(uint32_t*)(p + 1*stride)= | |
371 *(uint32_t*)(p + 2*stride)= | |
372 *(uint32_t*)(p + 3*stride)= size==4 ? val : val*0x01010101; | |
373 }else if(w==8 && h==1){ | |
374 *(uint32_t*)(p + 0)= | |
375 *(uint32_t*)(p + 4)= size==4 ? val : val*0x01010101; | |
376 }else if(w==8 && h==2){ | |
377 *(uint32_t*)(p + 0 + 0*stride)= | |
378 *(uint32_t*)(p + 4 + 0*stride)= | |
379 *(uint32_t*)(p + 0 + 1*stride)= | |
380 *(uint32_t*)(p + 4 + 1*stride)= size==4 ? val : val*0x01010101; | |
381 }else if(w==8 && h==4){ | |
382 *(uint64_t*)(p + 0*stride)= | |
383 *(uint64_t*)(p + 1*stride)= | |
384 *(uint64_t*)(p + 2*stride)= | |
385 *(uint64_t*)(p + 3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
386 }else if(w==16 && h==2){ | |
387 *(uint64_t*)(p + 0+0*stride)= | |
388 *(uint64_t*)(p + 8+0*stride)= | |
389 *(uint64_t*)(p + 0+1*stride)= | |
390 *(uint64_t*)(p + 8+1*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
391 }else if(w==16 && h==4){ | |
392 *(uint64_t*)(p + 0+0*stride)= | |
393 *(uint64_t*)(p + 8+0*stride)= | |
394 *(uint64_t*)(p + 0+1*stride)= | |
395 *(uint64_t*)(p + 8+1*stride)= | |
396 *(uint64_t*)(p + 0+2*stride)= | |
397 *(uint64_t*)(p + 8+2*stride)= | |
398 *(uint64_t*)(p + 0+3*stride)= | |
399 *(uint64_t*)(p + 8+3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
400 }else | |
401 assert(0); | |
402 } | |
403 | |
404 static inline void fill_caches(H264Context *h, int mb_type){ | |
405 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
|
406 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 407 int topleft_xy, top_xy, topright_xy, left_xy[2]; |
408 int topleft_type, top_type, topright_type, left_type[2]; | |
409 int left_block[4]; | |
410 int i; | |
411 | |
412 //wow what a mess, why didnt they simplify the interlacing&intra stuff, i cant imagine that these complex rules are worth it | |
413 | |
414 if(h->sps.mb_aff){ | |
415 //FIXME | |
1453 | 416 topleft_xy = 0; /* avoid warning */ |
417 top_xy = 0; /* avoid warning */ | |
418 topright_xy = 0; /* avoid warning */ | |
1168 | 419 }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
|
420 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
|
421 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
|
422 topright_xy= mb_xy+1 - s->mb_stride; |
1168 | 423 left_xy[0] = mb_xy-1; |
424 left_xy[1] = mb_xy-1; | |
425 left_block[0]= 0; | |
426 left_block[1]= 1; | |
427 left_block[2]= 2; | |
428 left_block[3]= 3; | |
429 } | |
430 | |
431 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0; | |
432 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0; | |
433 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0; | |
434 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0; | |
435 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0; | |
436 | |
437 if(IS_INTRA(mb_type)){ | |
438 h->topleft_samples_available= | |
439 h->top_samples_available= | |
440 h->left_samples_available= 0xFFFF; | |
441 h->topright_samples_available= 0xEEEA; | |
442 | |
443 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){ | |
444 h->topleft_samples_available= 0xB3FF; | |
445 h->top_samples_available= 0x33FF; | |
446 h->topright_samples_available= 0x26EA; | |
447 } | |
448 for(i=0; i<2; i++){ | |
449 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){ | |
450 h->topleft_samples_available&= 0xDF5F; | |
451 h->left_samples_available&= 0x5F5F; | |
452 } | |
453 } | |
454 | |
455 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred)) | |
456 h->topleft_samples_available&= 0x7FFF; | |
457 | |
458 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred)) | |
459 h->topright_samples_available&= 0xFBFF; | |
460 | |
461 if(IS_INTRA4x4(mb_type)){ | |
462 if(IS_INTRA4x4(top_type)){ | |
463 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4]; | |
464 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5]; | |
465 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6]; | |
466 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3]; | |
467 }else{ | |
468 int pred; | |
469 if(IS_INTRA16x16(top_type) || (IS_INTER(top_type) && !h->pps.constrained_intra_pred)) | |
470 pred= 2; | |
471 else{ | |
472 pred= -1; | |
473 } | |
474 h->intra4x4_pred_mode_cache[4+8*0]= | |
475 h->intra4x4_pred_mode_cache[5+8*0]= | |
476 h->intra4x4_pred_mode_cache[6+8*0]= | |
477 h->intra4x4_pred_mode_cache[7+8*0]= pred; | |
478 } | |
479 for(i=0; i<2; i++){ | |
480 if(IS_INTRA4x4(left_type[i])){ | |
481 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[0+2*i]]; | |
482 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[1+2*i]]; | |
483 }else{ | |
484 int pred; | |
485 if(IS_INTRA16x16(left_type[i]) || (IS_INTER(left_type[i]) && !h->pps.constrained_intra_pred)) | |
486 pred= 2; | |
487 else{ | |
488 pred= -1; | |
489 } | |
490 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= | |
491 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred; | |
492 } | |
493 } | |
494 } | |
495 } | |
496 | |
497 | |
498 /* | |
499 0 . T T. T T T T | |
500 1 L . .L . . . . | |
501 2 L . .L . . . . | |
502 3 . T TL . . . . | |
503 4 L . .L . . . . | |
504 5 L . .. . . . . | |
505 */ | |
506 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec) | |
507 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
|
508 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
|
509 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
|
510 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
|
511 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3]; |
1168 | 512 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
513 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
|
514 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8]; |
1168 | 515 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
516 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
|
517 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11]; |
2314 | 518 |
519 h->top_cbp= h->cbp_table[top_xy]; | |
1168 | 520 }else{ |
521 h->non_zero_count_cache[4+8*0]= | |
522 h->non_zero_count_cache[5+8*0]= | |
523 h->non_zero_count_cache[6+8*0]= | |
524 h->non_zero_count_cache[7+8*0]= | |
525 | |
526 h->non_zero_count_cache[1+8*0]= | |
527 h->non_zero_count_cache[2+8*0]= | |
528 | |
529 h->non_zero_count_cache[1+8*3]= | |
2314 | 530 h->non_zero_count_cache[2+8*3]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
531 | |
532 if(IS_INTRA(mb_type)) h->top_cbp= 0x1C0; | |
533 else h->top_cbp= 0; | |
1168 | 534 } |
535 | |
536 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
|
537 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
|
538 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
|
539 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
|
540 h->non_zero_count_cache[0+8*4]= h->non_zero_count[left_xy[0]][12]; |
2314 | 541 h->left_cbp= h->cbp_table[left_xy[0]]; //FIXME interlacing |
1168 | 542 }else{ |
543 h->non_zero_count_cache[3+8*1]= | |
544 h->non_zero_count_cache[3+8*2]= | |
545 h->non_zero_count_cache[0+8*1]= | |
2314 | 546 h->non_zero_count_cache[0+8*4]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
547 | |
548 if(IS_INTRA(mb_type)) h->left_cbp= 0x1C0;//FIXME interlacing | |
549 else h->left_cbp= 0; | |
1168 | 550 } |
551 | |
552 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
|
553 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
|
554 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
|
555 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
|
556 h->non_zero_count_cache[0+8*5]= h->non_zero_count[left_xy[1]][11]; |
1168 | 557 }else{ |
558 h->non_zero_count_cache[3+8*3]= | |
559 h->non_zero_count_cache[3+8*4]= | |
560 h->non_zero_count_cache[0+8*2]= | |
2314 | 561 h->non_zero_count_cache[0+8*5]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
1168 | 562 } |
563 | |
564 #if 1 | |
565 if(IS_INTER(mb_type)){ | |
566 int list; | |
567 for(list=0; list<2; list++){ | |
568 if((!IS_8X8(mb_type)) && !USES_LIST(mb_type, list)){ | |
569 /*if(!h->mv_cache_clean[list]){ | |
570 memset(h->mv_cache [list], 0, 8*5*2*sizeof(int16_t)); //FIXME clean only input? clean at all? | |
571 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t)); | |
572 h->mv_cache_clean[list]= 1; | |
573 }*/ | |
574 continue; //FIXME direct mode ... | |
575 } | |
576 h->mv_cache_clean[list]= 0; | |
577 | |
578 if(IS_INTER(topleft_type)){ | |
579 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride; | |
580 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride; | |
581 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; | |
582 h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy]; | |
583 }else{ | |
584 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= 0; | |
585 h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
586 } | |
587 | |
588 if(IS_INTER(top_type)){ | |
589 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; | |
590 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride; | |
591 *(uint32_t*)h->mv_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 0]; | |
592 *(uint32_t*)h->mv_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 1]; | |
593 *(uint32_t*)h->mv_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 2]; | |
594 *(uint32_t*)h->mv_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 3]; | |
595 h->ref_cache[list][scan8[0] + 0 - 1*8]= | |
596 h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][b8_xy + 0]; | |
597 h->ref_cache[list][scan8[0] + 2 - 1*8]= | |
598 h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][b8_xy + 1]; | |
599 }else{ | |
600 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]= | |
601 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]= | |
602 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]= | |
603 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0; | |
604 *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101; | |
605 } | |
606 | |
607 if(IS_INTER(topright_type)){ | |
608 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride; | |
609 const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride; | |
610 *(uint32_t*)h->mv_cache[list][scan8[0] + 4 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; | |
611 h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][b8_xy]; | |
612 }else{ | |
613 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0; | |
614 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
615 } | |
616 | |
617 //FIXME unify cleanup or sth | |
618 if(IS_INTER(left_type[0])){ | |
619 const int b_xy= h->mb2b_xy[left_xy[0]] + 3; | |
620 const int b8_xy= h->mb2b8_xy[left_xy[0]] + 1; | |
621 *(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]]; | |
622 *(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]]; | |
623 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
624 h->ref_cache[list][scan8[0] - 1 + 1*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0]>>1)]; | |
625 }else{ | |
626 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 0*8]= | |
627 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 1*8]= 0; | |
628 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
629 h->ref_cache[list][scan8[0] - 1 + 1*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
630 } | |
631 | |
632 if(IS_INTER(left_type[1])){ | |
633 const int b_xy= h->mb2b_xy[left_xy[1]] + 3; | |
634 const int b8_xy= h->mb2b8_xy[left_xy[1]] + 1; | |
635 *(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]]; | |
636 *(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]]; | |
637 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
638 h->ref_cache[list][scan8[0] - 1 + 3*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[2]>>1)]; | |
639 }else{ | |
640 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 2*8]= | |
641 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 3*8]= 0; | |
642 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
643 h->ref_cache[list][scan8[0] - 1 + 3*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
644 } | |
645 | |
646 h->ref_cache[list][scan8[5 ]+1] = | |
647 h->ref_cache[list][scan8[7 ]+1] = | |
648 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewher else) | |
649 h->ref_cache[list][scan8[4 ]] = | |
650 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; | |
651 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]= | |
652 *(uint32_t*)h->mv_cache [list][scan8[7 ]+1]= | |
653 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewher else) | |
654 *(uint32_t*)h->mv_cache [list][scan8[4 ]]= | |
655 *(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
|
656 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
657 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
|
658 /* 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
|
659 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
|
660 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
|
661 *(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
|
662 }else{ |
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]= 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
664 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
665 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
666 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
|
667 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
|
668 *(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
|
669 *(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
|
670 *(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
|
671 *(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
|
672 }else{ |
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] + 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
|
674 *(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
|
675 *(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
|
676 *(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
|
677 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
678 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
|
679 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
|
680 *(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
|
681 *(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
|
682 }else{ |
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[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
|
684 *(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
|
685 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
686 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
|
687 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
|
688 *(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
|
689 *(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
|
690 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
691 *(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
|
692 *(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
|
693 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
694 *(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
|
695 *(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
|
696 *(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
|
697 *(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
|
698 *(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
|
699 } |
1168 | 700 } |
701 //FIXME | |
702 } | |
703 #endif | |
704 } | |
705 | |
706 static inline void write_back_intra_pred_mode(H264Context *h){ | |
707 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
|
708 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 709 |
710 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1]; | |
711 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2]; | |
712 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3]; | |
713 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4]; | |
714 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4]; | |
715 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4]; | |
716 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4]; | |
717 } | |
718 | |
719 /** | |
720 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
721 */ | |
722 static inline int check_intra4x4_pred_mode(H264Context *h){ | |
723 MpegEncContext * const s = &h->s; | |
724 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0}; | |
725 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED}; | |
726 int i; | |
727 | |
728 if(!(h->top_samples_available&0x8000)){ | |
729 for(i=0; i<4; i++){ | |
730 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ]; | |
731 if(status<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
732 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 | 733 return -1; |
734 } else if(status){ | |
735 h->intra4x4_pred_mode_cache[scan8[0] + i]= status; | |
736 } | |
737 } | |
738 } | |
739 | |
740 if(!(h->left_samples_available&0x8000)){ | |
741 for(i=0; i<4; i++){ | |
742 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ]; | |
743 if(status<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
744 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 | 745 return -1; |
746 } else if(status){ | |
747 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status; | |
748 } | |
749 } | |
750 } | |
751 | |
752 return 0; | |
753 } //FIXME cleanup like next | |
754 | |
755 /** | |
756 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
757 */ | |
758 static inline int check_intra_pred_mode(H264Context *h, int mode){ | |
759 MpegEncContext * const s = &h->s; | |
760 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1}; | |
761 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8}; | |
762 | |
2392 | 763 if(mode < 0 || mode > 6) { |
764 av_log(h->s.avctx, AV_LOG_ERROR, "out of range intra chroma pred mode at %d %d\n", s->mb_x, s->mb_y); | |
2163 | 765 return -1; |
2392 | 766 } |
2163 | 767 |
1168 | 768 if(!(h->top_samples_available&0x8000)){ |
769 mode= top[ mode ]; | |
770 if(mode<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
771 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 | 772 return -1; |
773 } | |
774 } | |
775 | |
776 if(!(h->left_samples_available&0x8000)){ | |
777 mode= left[ mode ]; | |
778 if(mode<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
779 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 | 780 return -1; |
781 } | |
782 } | |
783 | |
784 return mode; | |
785 } | |
786 | |
787 /** | |
788 * gets the predicted intra4x4 prediction mode. | |
789 */ | |
790 static inline int pred_intra_mode(H264Context *h, int n){ | |
791 const int index8= scan8[n]; | |
792 const int left= h->intra4x4_pred_mode_cache[index8 - 1]; | |
793 const int top = h->intra4x4_pred_mode_cache[index8 - 8]; | |
794 const int min= FFMIN(left, top); | |
795 | |
1170 | 796 tprintf("mode:%d %d min:%d\n", left ,top, min); |
1168 | 797 |
798 if(min<0) return DC_PRED; | |
799 else return min; | |
800 } | |
801 | |
802 static inline void write_back_non_zero_count(H264Context *h){ | |
803 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
|
804 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
|
805 |
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][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
|
807 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
|
808 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
|
809 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
|
810 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
|
811 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
|
812 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
|
813 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
814 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
|
815 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
|
816 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
|
817 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
818 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
|
819 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
|
820 h->non_zero_count[mb_xy][12]=h->non_zero_count_cache[2+8*4]; |
1168 | 821 } |
822 | |
823 /** | |
824 * gets the predicted number of non zero coefficients. | |
825 * @param n block index | |
826 */ | |
827 static inline int pred_non_zero_count(H264Context *h, int n){ | |
828 const int index8= scan8[n]; | |
829 const int left= h->non_zero_count_cache[index8 - 1]; | |
830 const int top = h->non_zero_count_cache[index8 - 8]; | |
831 int i= left + top; | |
832 | |
833 if(i<64) i= (i+1)>>1; | |
834 | |
1170 | 835 tprintf("pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31); |
1168 | 836 |
837 return i&31; | |
838 } | |
839 | |
1169 | 840 static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width){ |
841 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ]; | |
842 | |
843 if(topright_ref != PART_NOT_AVAILABLE){ | |
844 *C= h->mv_cache[list][ i - 8 + part_width ]; | |
845 return topright_ref; | |
846 }else{ | |
1170 | 847 tprintf("topright MV not available\n"); |
848 | |
1169 | 849 *C= h->mv_cache[list][ i - 8 - 1 ]; |
850 return h->ref_cache[list][ i - 8 - 1 ]; | |
851 } | |
852 } | |
853 | |
1168 | 854 /** |
855 * gets the predicted MV. | |
856 * @param n the block index | |
857 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4) | |
858 * @param mx the x component of the predicted motion vector | |
859 * @param my the y component of the predicted motion vector | |
860 */ | |
861 static inline void pred_motion(H264Context * const h, int n, int part_width, int list, int ref, int * const mx, int * const my){ | |
862 const int index8= scan8[n]; | |
863 const int top_ref= h->ref_cache[list][ index8 - 8 ]; | |
864 const int left_ref= h->ref_cache[list][ index8 - 1 ]; | |
865 const int16_t * const A= h->mv_cache[list][ index8 - 1 ]; | |
866 const int16_t * const B= h->mv_cache[list][ index8 - 8 ]; | |
1169 | 867 const int16_t * C; |
868 int diagonal_ref, match_count; | |
869 | |
1168 | 870 assert(part_width==1 || part_width==2 || part_width==4); |
1169 | 871 |
1168 | 872 /* mv_cache |
873 B . . A T T T T | |
874 U . . L . . , . | |
875 U . . L . . . . | |
876 U . . L . . , . | |
877 . . . L . . . . | |
878 */ | |
1169 | 879 |
880 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width); | |
881 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref); | |
882 if(match_count > 1){ //most common | |
883 *mx= mid_pred(A[0], B[0], C[0]); | |
884 *my= mid_pred(A[1], B[1], C[1]); | |
885 }else if(match_count==1){ | |
886 if(left_ref==ref){ | |
887 *mx= A[0]; | |
888 *my= A[1]; | |
889 }else if(top_ref==ref){ | |
890 *mx= B[0]; | |
891 *my= B[1]; | |
892 }else{ | |
893 *mx= C[0]; | |
894 *my= C[1]; | |
895 } | |
896 }else{ | |
897 if(top_ref == PART_NOT_AVAILABLE && diagonal_ref == PART_NOT_AVAILABLE && left_ref != PART_NOT_AVAILABLE){ | |
898 *mx= A[0]; | |
899 *my= A[1]; | |
1168 | 900 }else{ |
901 *mx= mid_pred(A[0], B[0], C[0]); | |
902 *my= mid_pred(A[1], B[1], C[1]); | |
903 } | |
1169 | 904 } |
1168 | 905 |
1187 | 906 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 | 907 } |
908 | |
909 /** | |
910 * gets the directionally predicted 16x8 MV. | |
911 * @param n the block index | |
912 * @param mx the x component of the predicted motion vector | |
913 * @param my the y component of the predicted motion vector | |
914 */ | |
915 static inline void pred_16x8_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
916 if(n==0){ | |
917 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ]; | |
918 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ]; | |
919 | |
1187 | 920 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 | 921 |
922 if(top_ref == ref){ | |
923 *mx= B[0]; | |
924 *my= B[1]; | |
925 return; | |
926 } | |
927 }else{ | |
928 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ]; | |
929 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ]; | |
930 | |
1187 | 931 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 | 932 |
933 if(left_ref == ref){ | |
934 *mx= A[0]; | |
935 *my= A[1]; | |
936 return; | |
937 } | |
938 } | |
939 | |
940 //RARE | |
941 pred_motion(h, n, 4, list, ref, mx, my); | |
942 } | |
943 | |
944 /** | |
945 * gets the directionally predicted 8x16 MV. | |
946 * @param n the block index | |
947 * @param mx the x component of the predicted motion vector | |
948 * @param my the y component of the predicted motion vector | |
949 */ | |
950 static inline void pred_8x16_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
951 if(n==0){ | |
952 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ]; | |
953 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ]; | |
954 | |
1187 | 955 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 | 956 |
957 if(left_ref == ref){ | |
958 *mx= A[0]; | |
959 *my= A[1]; | |
960 return; | |
961 } | |
962 }else{ | |
1169 | 963 const int16_t * C; |
964 int diagonal_ref; | |
965 | |
966 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2); | |
1168 | 967 |
1187 | 968 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 | 969 |
1169 | 970 if(diagonal_ref == ref){ |
1168 | 971 *mx= C[0]; |
972 *my= C[1]; | |
973 return; | |
974 } | |
975 } | |
976 | |
977 //RARE | |
978 pred_motion(h, n, 2, list, ref, mx, my); | |
979 } | |
980 | |
981 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){ | |
982 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ]; | |
983 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ]; | |
984 | |
2392 | 985 tprintf("pred_pskip: (%d) (%d) at %2d %2d\n", top_ref, left_ref, h->s.mb_x, h->s.mb_y); |
1168 | 986 |
987 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE | |
988 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0) | |
989 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){ | |
990 | |
991 *mx = *my = 0; | |
992 return; | |
993 } | |
994 | |
995 pred_motion(h, 0, 4, 0, 0, mx, my); | |
996 | |
997 return; | |
998 } | |
999 | |
1000 static inline void write_back_motion(H264Context *h, int mb_type){ | |
1001 MpegEncContext * const s = &h->s; | |
1002 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
1003 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
1004 int list; | |
1005 | |
1006 for(list=0; list<2; list++){ | |
1007 int y; | |
1008 if((!IS_8X8(mb_type)) && !USES_LIST(mb_type, list)){ | |
1009 if(1){ //FIXME skip or never read if mb_type doesnt use it | |
1010 for(y=0; y<4; y++){ | |
1011 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]= | |
1012 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= 0; | |
1013 } | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1014 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
|
1015 /* FIXME needed ? */ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1016 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
|
1017 *(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
|
1018 *(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
|
1019 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1020 } |
1168 | 1021 for(y=0; y<2; y++){ |
2365
b76a4977447a
Fixed typo which caused incorrect motion prediction in B-frames. patch by (Loren Merritt <lorenm ta u tod washington tod edu>)
michael
parents:
2336
diff
changeset
|
1022 *(uint16_t*)&s->current_picture.ref_index[list][b8_xy + y*h->b8_stride]= (LIST_NOT_USED&0xFF)*0x0101; |
1168 | 1023 } |
1024 } | |
1025 continue; //FIXME direct mode ... | |
1026 } | |
1027 | |
1028 for(y=0; y<4; y++){ | |
1029 *(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]; | |
1030 *(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]; | |
1031 } | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1032 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
|
1033 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
|
1034 *(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
|
1035 *(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
|
1036 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1037 } |
1168 | 1038 for(y=0; y<2; y++){ |
1039 s->current_picture.ref_index[list][b8_xy + 0 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+0 + 16*y]; | |
1040 s->current_picture.ref_index[list][b8_xy + 1 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+2 + 16*y]; | |
1041 } | |
1042 } | |
1043 } | |
1044 | |
1045 /** | |
1046 * Decodes a network abstraction layer unit. | |
1047 * @param consumed is the number of bytes used as input | |
1048 * @param length is the length of the array | |
1049 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp ttailing? | |
1050 * @returns decoded bytes, might be src+1 if no escapes | |
1051 */ | |
1052 static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *consumed, int length){ | |
1053 int i, si, di; | |
1054 uint8_t *dst; | |
1055 | |
1056 // src[0]&0x80; //forbidden bit | |
1057 h->nal_ref_idc= src[0]>>5; | |
1058 h->nal_unit_type= src[0]&0x1F; | |
1059 | |
1060 src++; length--; | |
1061 #if 0 | |
1062 for(i=0; i<length; i++) | |
1063 printf("%2X ", src[i]); | |
1064 #endif | |
1065 for(i=0; i+1<length; i+=2){ | |
1066 if(src[i]) continue; | |
1067 if(i>0 && src[i-1]==0) i--; | |
1068 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
1069 if(src[i+2]!=3){ | |
1070 /* startcode, so we must be past the end */ | |
1071 length=i; | |
1072 } | |
1073 break; | |
1074 } | |
1075 } | |
1076 | |
1077 if(i>=length-1){ //no escaped 0 | |
1078 *dst_length= length; | |
1079 *consumed= length+1; //+1 for the header | |
1080 return src; | |
1081 } | |
1082 | |
1083 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length); | |
1084 dst= h->rbsp_buffer; | |
1085 | |
1086 //printf("deoding esc\n"); | |
1087 si=di=0; | |
1088 while(si<length){ | |
1089 //remove escapes (very rare 1:2^22) | |
1090 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
1091 if(src[si+2]==3){ //escape | |
1092 dst[di++]= 0; | |
1093 dst[di++]= 0; | |
1094 si+=3; | |
1957
54411768fa38
h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1956
diff
changeset
|
1095 continue; |
1168 | 1096 }else //next start code |
1097 break; | |
1098 } | |
1099 | |
1100 dst[di++]= src[si++]; | |
1101 } | |
1102 | |
1103 *dst_length= di; | |
1104 *consumed= si + 1;//+1 for the header | |
1105 //FIXME store exact number of bits in the getbitcontext (its needed for decoding) | |
1106 return dst; | |
1107 } | |
1108 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1109 #if 0 |
1168 | 1110 /** |
1111 * @param src the data which should be escaped | |
1112 * @param dst the target buffer, dst+1 == src is allowed as a special case | |
1113 * @param length the length of the src data | |
1114 * @param dst_length the length of the dst array | |
1115 * @returns length of escaped data in bytes or -1 if an error occured | |
1116 */ | |
1117 static int encode_nal(H264Context *h, uint8_t *dst, uint8_t *src, int length, int dst_length){ | |
1118 int i, escape_count, si, di; | |
1119 uint8_t *temp; | |
1120 | |
1121 assert(length>=0); | |
1122 assert(dst_length>0); | |
1123 | |
1124 dst[0]= (h->nal_ref_idc<<5) + h->nal_unit_type; | |
1125 | |
1126 if(length==0) return 1; | |
1127 | |
1128 escape_count= 0; | |
1129 for(i=0; i<length; i+=2){ | |
1130 if(src[i]) continue; | |
1131 if(i>0 && src[i-1]==0) | |
1132 i--; | |
1133 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
1134 escape_count++; | |
1135 i+=2; | |
1136 } | |
1137 } | |
1138 | |
1139 if(escape_count==0){ | |
1140 if(dst+1 != src) | |
1141 memcpy(dst+1, src, length); | |
1142 return length + 1; | |
1143 } | |
1144 | |
1145 if(length + escape_count + 1> dst_length) | |
1146 return -1; | |
1147 | |
1148 //this should be damn rare (hopefully) | |
1149 | |
1150 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length + escape_count); | |
1151 temp= h->rbsp_buffer; | |
1152 //printf("encoding esc\n"); | |
1153 | |
1154 si= 0; | |
1155 di= 0; | |
1156 while(si < length){ | |
1157 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
1158 temp[di++]= 0; si++; | |
1159 temp[di++]= 0; si++; | |
1160 temp[di++]= 3; | |
1161 temp[di++]= src[si++]; | |
1162 } | |
1163 else | |
1164 temp[di++]= src[si++]; | |
1165 } | |
1166 memcpy(dst+1, temp, length+escape_count); | |
1167 | |
1168 assert(di == length+escape_count); | |
1169 | |
1170 return di + 1; | |
1171 } | |
1172 | |
1173 /** | |
1174 * write 1,10,100,1000,... for alignment, yes its exactly inverse to mpeg4 | |
1175 */ | |
1176 static void encode_rbsp_trailing(PutBitContext *pb){ | |
1177 int length; | |
1178 put_bits(pb, 1, 1); | |
1786 | 1179 length= (-put_bits_count(pb))&7; |
1168 | 1180 if(length) put_bits(pb, length, 0); |
1181 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1182 #endif |
1168 | 1183 |
1184 /** | |
1185 * identifies the exact end of the bitstream | |
1186 * @return the length of the trailing, or 0 if damaged | |
1187 */ | |
1188 static int decode_rbsp_trailing(uint8_t *src){ | |
1189 int v= *src; | |
1190 int r; | |
1191 | |
1170 | 1192 tprintf("rbsp trailing %X\n", v); |
1168 | 1193 |
1194 for(r=1; r<9; r++){ | |
1195 if(v&1) return r; | |
1196 v>>=1; | |
1197 } | |
1198 return 0; | |
1199 } | |
1200 | |
1201 /** | |
1202 * idct tranforms the 16 dc values and dequantize them. | |
1203 * @param qp quantization parameter | |
1204 */ | |
1205 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
1206 const int qmul= dequant_coeff[qp][0]; | |
1207 #define stride 16 | |
1208 int i; | |
1209 int temp[16]; //FIXME check if this is a good idea | |
1210 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
1211 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
1212 | |
1213 //memset(block, 64, 2*256); | |
1214 //return; | |
1215 for(i=0; i<4; i++){ | |
1216 const int offset= y_offset[i]; | |
1217 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
1218 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
1219 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
1220 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
1221 | |
1222 temp[4*i+0]= z0+z3; | |
1223 temp[4*i+1]= z1+z2; | |
1224 temp[4*i+2]= z1-z2; | |
1225 temp[4*i+3]= z0-z3; | |
1226 } | |
1227 | |
1228 for(i=0; i<4; i++){ | |
1229 const int offset= x_offset[i]; | |
1230 const int z0= temp[4*0+i] + temp[4*2+i]; | |
1231 const int z1= temp[4*0+i] - temp[4*2+i]; | |
1232 const int z2= temp[4*1+i] - temp[4*3+i]; | |
1233 const int z3= temp[4*1+i] + temp[4*3+i]; | |
1234 | |
1235 block[stride*0 +offset]= ((z0 + z3)*qmul + 2)>>2; //FIXME think about merging this into decode_resdual | |
1236 block[stride*2 +offset]= ((z1 + z2)*qmul + 2)>>2; | |
1237 block[stride*8 +offset]= ((z1 - z2)*qmul + 2)>>2; | |
1238 block[stride*10+offset]= ((z0 - z3)*qmul + 2)>>2; | |
1239 } | |
1240 } | |
1241 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1242 #if 0 |
1168 | 1243 /** |
1244 * dct tranforms the 16 dc values. | |
1245 * @param qp quantization parameter ??? FIXME | |
1246 */ | |
1247 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){ | |
1248 // const int qmul= dequant_coeff[qp][0]; | |
1249 int i; | |
1250 int temp[16]; //FIXME check if this is a good idea | |
1251 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
1252 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
1253 | |
1254 for(i=0; i<4; i++){ | |
1255 const int offset= y_offset[i]; | |
1256 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
1257 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
1258 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
1259 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
1260 | |
1261 temp[4*i+0]= z0+z3; | |
1262 temp[4*i+1]= z1+z2; | |
1263 temp[4*i+2]= z1-z2; | |
1264 temp[4*i+3]= z0-z3; | |
1265 } | |
1266 | |
1267 for(i=0; i<4; i++){ | |
1268 const int offset= x_offset[i]; | |
1269 const int z0= temp[4*0+i] + temp[4*2+i]; | |
1270 const int z1= temp[4*0+i] - temp[4*2+i]; | |
1271 const int z2= temp[4*1+i] - temp[4*3+i]; | |
1272 const int z3= temp[4*1+i] + temp[4*3+i]; | |
1273 | |
1274 block[stride*0 +offset]= (z0 + z3)>>1; | |
1275 block[stride*2 +offset]= (z1 + z2)>>1; | |
1276 block[stride*8 +offset]= (z1 - z2)>>1; | |
1277 block[stride*10+offset]= (z0 - z3)>>1; | |
1278 } | |
1279 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1280 #endif |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1281 |
1168 | 1282 #undef xStride |
1283 #undef stride | |
1284 | |
1285 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
1286 const int qmul= dequant_coeff[qp][0]; | |
1287 const int stride= 16*2; | |
1288 const int xStride= 16; | |
1289 int a,b,c,d,e; | |
1290 | |
1291 a= block[stride*0 + xStride*0]; | |
1292 b= block[stride*0 + xStride*1]; | |
1293 c= block[stride*1 + xStride*0]; | |
1294 d= block[stride*1 + xStride*1]; | |
1295 | |
1296 e= a-b; | |
1297 a= a+b; | |
1298 b= c-d; | |
1299 c= c+d; | |
1300 | |
1301 block[stride*0 + xStride*0]= ((a+c)*qmul + 0)>>1; | |
1302 block[stride*0 + xStride*1]= ((e+b)*qmul + 0)>>1; | |
1303 block[stride*1 + xStride*0]= ((a-c)*qmul + 0)>>1; | |
1304 block[stride*1 + xStride*1]= ((e-b)*qmul + 0)>>1; | |
1305 } | |
1306 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1307 #if 0 |
1168 | 1308 static void chroma_dc_dct_c(DCTELEM *block){ |
1309 const int stride= 16*2; | |
1310 const int xStride= 16; | |
1311 int a,b,c,d,e; | |
1312 | |
1313 a= block[stride*0 + xStride*0]; | |
1314 b= block[stride*0 + xStride*1]; | |
1315 c= block[stride*1 + xStride*0]; | |
1316 d= block[stride*1 + xStride*1]; | |
1317 | |
1318 e= a-b; | |
1319 a= a+b; | |
1320 b= c-d; | |
1321 c= c+d; | |
1322 | |
1323 block[stride*0 + xStride*0]= (a+c); | |
1324 block[stride*0 + xStride*1]= (e+b); | |
1325 block[stride*1 + xStride*0]= (a-c); | |
1326 block[stride*1 + xStride*1]= (e-b); | |
1327 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1328 #endif |
1168 | 1329 |
1330 /** | |
1331 * gets the chroma qp. | |
1332 */ | |
1333 static inline int get_chroma_qp(H264Context *h, int qscale){ | |
1334 | |
1335 return chroma_qp[clip(qscale + h->pps.chroma_qp_index_offset, 0, 51)]; | |
1336 } | |
1337 | |
1338 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1339 #if 0 |
1168 | 1340 static void h264_diff_dct_c(DCTELEM *block, uint8_t *src1, uint8_t *src2, int stride){ |
1341 int i; | |
1342 //FIXME try int temp instead of block | |
1343 | |
1344 for(i=0; i<4; i++){ | |
1345 const int d0= src1[0 + i*stride] - src2[0 + i*stride]; | |
1346 const int d1= src1[1 + i*stride] - src2[1 + i*stride]; | |
1347 const int d2= src1[2 + i*stride] - src2[2 + i*stride]; | |
1348 const int d3= src1[3 + i*stride] - src2[3 + i*stride]; | |
1349 const int z0= d0 + d3; | |
1350 const int z3= d0 - d3; | |
1351 const int z1= d1 + d2; | |
1352 const int z2= d1 - d2; | |
1353 | |
1354 block[0 + 4*i]= z0 + z1; | |
1355 block[1 + 4*i]= 2*z3 + z2; | |
1356 block[2 + 4*i]= z0 - z1; | |
1357 block[3 + 4*i]= z3 - 2*z2; | |
1358 } | |
1359 | |
1360 for(i=0; i<4; i++){ | |
1361 const int z0= block[0*4 + i] + block[3*4 + i]; | |
1362 const int z3= block[0*4 + i] - block[3*4 + i]; | |
1363 const int z1= block[1*4 + i] + block[2*4 + i]; | |
1364 const int z2= block[1*4 + i] - block[2*4 + i]; | |
1365 | |
1366 block[0*4 + i]= z0 + z1; | |
1367 block[1*4 + i]= 2*z3 + z2; | |
1368 block[2*4 + i]= z0 - z1; | |
1369 block[3*4 + i]= z3 - 2*z2; | |
1370 } | |
1371 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1372 #endif |
1168 | 1373 |
1374 //FIXME need to check that this doesnt overflow signed 32 bit for low qp, iam not sure, its very close | |
1375 //FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away) | |
1376 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int seperate_dc){ | |
1377 int i; | |
1378 const int * const quant_table= quant_coeff[qscale]; | |
1379 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6; | |
1380 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1; | |
1381 const unsigned int threshold2= (threshold1<<1); | |
1382 int last_non_zero; | |
1383 | |
1384 if(seperate_dc){ | |
1385 if(qscale<=18){ | |
1386 //avoid overflows | |
1387 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6; | |
1388 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1; | |
1389 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
1390 | |
1391 int level= block[0]*quant_coeff[qscale+18][0]; | |
1392 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
1393 if(level>0){ | |
1394 level= (dc_bias + level)>>(QUANT_SHIFT-2); | |
1395 block[0]= level; | |
1396 }else{ | |
1397 level= (dc_bias - level)>>(QUANT_SHIFT-2); | |
1398 block[0]= -level; | |
1399 } | |
1400 // last_non_zero = i; | |
1401 }else{ | |
1402 block[0]=0; | |
1403 } | |
1404 }else{ | |
1405 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6; | |
1406 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1; | |
1407 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
1408 | |
1409 int level= block[0]*quant_table[0]; | |
1410 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
1411 if(level>0){ | |
1412 level= (dc_bias + level)>>(QUANT_SHIFT+1); | |
1413 block[0]= level; | |
1414 }else{ | |
1415 level= (dc_bias - level)>>(QUANT_SHIFT+1); | |
1416 block[0]= -level; | |
1417 } | |
1418 // last_non_zero = i; | |
1419 }else{ | |
1420 block[0]=0; | |
1421 } | |
1422 } | |
1423 last_non_zero= 0; | |
1424 i=1; | |
1425 }else{ | |
1426 last_non_zero= -1; | |
1427 i=0; | |
1428 } | |
1429 | |
1430 for(; i<16; i++){ | |
1431 const int j= scantable[i]; | |
1432 int level= block[j]*quant_table[j]; | |
1433 | |
1434 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
1435 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
1436 if(((unsigned)(level+threshold1))>threshold2){ | |
1437 if(level>0){ | |
1438 level= (bias + level)>>QUANT_SHIFT; | |
1439 block[j]= level; | |
1440 }else{ | |
1441 level= (bias - level)>>QUANT_SHIFT; | |
1442 block[j]= -level; | |
1443 } | |
1444 last_non_zero = i; | |
1445 }else{ | |
1446 block[j]=0; | |
1447 } | |
1448 } | |
1449 | |
1450 return last_non_zero; | |
1451 } | |
1452 | |
1453 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){ | |
1454 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
1455 ((uint32_t*)(src+0*stride))[0]= a; | |
1456 ((uint32_t*)(src+1*stride))[0]= a; | |
1457 ((uint32_t*)(src+2*stride))[0]= a; | |
1458 ((uint32_t*)(src+3*stride))[0]= a; | |
1459 } | |
1460 | |
1461 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){ | |
1462 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101; | |
1463 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101; | |
1464 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101; | |
1465 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101; | |
1466 } | |
1467 | |
1468 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
1469 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] | |
1470 + src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 4) >>3; | |
1471 | |
1472 ((uint32_t*)(src+0*stride))[0]= | |
1473 ((uint32_t*)(src+1*stride))[0]= | |
1474 ((uint32_t*)(src+2*stride))[0]= | |
1475 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
1476 } | |
1477 | |
1478 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
1479 const int dc= ( src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 2) >>2; | |
1480 | |
1481 ((uint32_t*)(src+0*stride))[0]= | |
1482 ((uint32_t*)(src+1*stride))[0]= | |
1483 ((uint32_t*)(src+2*stride))[0]= | |
1484 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
1485 } | |
1486 | |
1487 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
1488 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2; | |
1489 | |
1490 ((uint32_t*)(src+0*stride))[0]= | |
1491 ((uint32_t*)(src+1*stride))[0]= | |
1492 ((uint32_t*)(src+2*stride))[0]= | |
1493 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
1494 } | |
1495 | |
1496 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
1497 ((uint32_t*)(src+0*stride))[0]= | |
1498 ((uint32_t*)(src+1*stride))[0]= | |
1499 ((uint32_t*)(src+2*stride))[0]= | |
1500 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U; | |
1501 } | |
1502 | |
1503 | |
1504 #define LOAD_TOP_RIGHT_EDGE\ | |
1505 const int t4= topright[0];\ | |
1506 const int t5= topright[1];\ | |
1507 const int t6= topright[2];\ | |
1508 const int t7= topright[3];\ | |
1509 | |
1510 #define LOAD_LEFT_EDGE\ | |
1511 const int l0= src[-1+0*stride];\ | |
1512 const int l1= src[-1+1*stride];\ | |
1513 const int l2= src[-1+2*stride];\ | |
1514 const int l3= src[-1+3*stride];\ | |
1515 | |
1516 #define LOAD_TOP_EDGE\ | |
1517 const int t0= src[ 0-1*stride];\ | |
1518 const int t1= src[ 1-1*stride];\ | |
1519 const int t2= src[ 2-1*stride];\ | |
1520 const int t3= src[ 3-1*stride];\ | |
1521 | |
1522 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
1523 const int lt= src[-1-1*stride]; | |
1524 LOAD_TOP_EDGE | |
1525 LOAD_LEFT_EDGE | |
1526 | |
1527 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2; | |
1528 src[0+2*stride]= | |
1529 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2; | |
1530 src[0+1*stride]= | |
1531 src[1+2*stride]= | |
1532 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2; | |
1533 src[0+0*stride]= | |
1534 src[1+1*stride]= | |
1535 src[2+2*stride]= | |
1536 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
1537 src[1+0*stride]= | |
1538 src[2+1*stride]= | |
1539 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
1540 src[2+0*stride]= | |
1541 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
1542 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
1282 | 1543 } |
1168 | 1544 |
1545 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
1546 LOAD_TOP_EDGE | |
1547 LOAD_TOP_RIGHT_EDGE | |
1548 // LOAD_LEFT_EDGE | |
1549 | |
1550 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2; | |
1551 src[1+0*stride]= | |
1552 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2; | |
1553 src[2+0*stride]= | |
1554 src[1+1*stride]= | |
1555 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2; | |
1556 src[3+0*stride]= | |
1557 src[2+1*stride]= | |
1558 src[1+2*stride]= | |
1559 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2; | |
1560 src[3+1*stride]= | |
1561 src[2+2*stride]= | |
1562 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2; | |
1563 src[3+2*stride]= | |
1564 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2; | |
1565 src[3+3*stride]=(t6 + 3*t7 + 2)>>2; | |
1282 | 1566 } |
1168 | 1567 |
1568 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
1569 const int lt= src[-1-1*stride]; | |
1570 LOAD_TOP_EDGE | |
1571 LOAD_LEFT_EDGE | |
1572 const __attribute__((unused)) int unu= l3; | |
1573 | |
1574 src[0+0*stride]= | |
1575 src[1+2*stride]=(lt + t0 + 1)>>1; | |
1576 src[1+0*stride]= | |
1577 src[2+2*stride]=(t0 + t1 + 1)>>1; | |
1578 src[2+0*stride]= | |
1579 src[3+2*stride]=(t1 + t2 + 1)>>1; | |
1580 src[3+0*stride]=(t2 + t3 + 1)>>1; | |
1581 src[0+1*stride]= | |
1582 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
1583 src[1+1*stride]= | |
1584 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
1585 src[2+1*stride]= | |
1586 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
1587 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
1588 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
1589 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
1282 | 1590 } |
1168 | 1591 |
1592 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
1593 LOAD_TOP_EDGE | |
1594 LOAD_TOP_RIGHT_EDGE | |
1595 const __attribute__((unused)) int unu= t7; | |
1596 | |
1597 src[0+0*stride]=(t0 + t1 + 1)>>1; | |
1598 src[1+0*stride]= | |
1599 src[0+2*stride]=(t1 + t2 + 1)>>1; | |
1600 src[2+0*stride]= | |
1601 src[1+2*stride]=(t2 + t3 + 1)>>1; | |
1602 src[3+0*stride]= | |
1603 src[2+2*stride]=(t3 + t4+ 1)>>1; | |
1604 src[3+2*stride]=(t4 + t5+ 1)>>1; | |
1605 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
1606 src[1+1*stride]= | |
1607 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
1608 src[2+1*stride]= | |
1609 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2; | |
1610 src[3+1*stride]= | |
1611 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; | |
1612 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; | |
1282 | 1613 } |
1168 | 1614 |
1615 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ | |
1616 LOAD_LEFT_EDGE | |
1617 | |
1618 src[0+0*stride]=(l0 + l1 + 1)>>1; | |
1619 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
1620 src[2+0*stride]= | |
1621 src[0+1*stride]=(l1 + l2 + 1)>>1; | |
1622 src[3+0*stride]= | |
1623 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
1624 src[2+1*stride]= | |
1625 src[0+2*stride]=(l2 + l3 + 1)>>1; | |
1626 src[3+1*stride]= | |
1627 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2; | |
1628 src[3+2*stride]= | |
1629 src[1+3*stride]= | |
1630 src[0+3*stride]= | |
1631 src[2+2*stride]= | |
1632 src[2+3*stride]= | |
1633 src[3+3*stride]=l3; | |
1282 | 1634 } |
1168 | 1635 |
1636 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){ | |
1637 const int lt= src[-1-1*stride]; | |
1638 LOAD_TOP_EDGE | |
1639 LOAD_LEFT_EDGE | |
1640 const __attribute__((unused)) int unu= t3; | |
1641 | |
1642 src[0+0*stride]= | |
1643 src[2+1*stride]=(lt + l0 + 1)>>1; | |
1644 src[1+0*stride]= | |
1645 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
1646 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
1647 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
1648 src[0+1*stride]= | |
1649 src[2+2*stride]=(l0 + l1 + 1)>>1; | |
1650 src[1+1*stride]= | |
1651 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
1652 src[0+2*stride]= | |
1653 src[2+3*stride]=(l1 + l2+ 1)>>1; | |
1654 src[1+2*stride]= | |
1655 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
1656 src[0+3*stride]=(l2 + l3 + 1)>>1; | |
1657 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
1282 | 1658 } |
1168 | 1659 |
1660 static void pred16x16_vertical_c(uint8_t *src, int stride){ | |
1661 int i; | |
1662 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
1663 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
1664 const uint32_t c= ((uint32_t*)(src-stride))[2]; | |
1665 const uint32_t d= ((uint32_t*)(src-stride))[3]; | |
1666 | |
1667 for(i=0; i<16; i++){ | |
1668 ((uint32_t*)(src+i*stride))[0]= a; | |
1669 ((uint32_t*)(src+i*stride))[1]= b; | |
1670 ((uint32_t*)(src+i*stride))[2]= c; | |
1671 ((uint32_t*)(src+i*stride))[3]= d; | |
1672 } | |
1673 } | |
1674 | |
1675 static void pred16x16_horizontal_c(uint8_t *src, int stride){ | |
1676 int i; | |
1677 | |
1678 for(i=0; i<16; i++){ | |
1679 ((uint32_t*)(src+i*stride))[0]= | |
1680 ((uint32_t*)(src+i*stride))[1]= | |
1681 ((uint32_t*)(src+i*stride))[2]= | |
1682 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101; | |
1683 } | |
1684 } | |
1685 | |
1686 static void pred16x16_dc_c(uint8_t *src, int stride){ | |
1687 int i, dc=0; | |
1688 | |
1689 for(i=0;i<16; i++){ | |
1690 dc+= src[-1+i*stride]; | |
1691 } | |
1692 | |
1693 for(i=0;i<16; i++){ | |
1694 dc+= src[i-stride]; | |
1695 } | |
1696 | |
1697 dc= 0x01010101*((dc + 16)>>5); | |
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]= dc; | |
1704 } | |
1705 } | |
1706 | |
1707 static void pred16x16_left_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 dc= 0x01010101*((dc + 8)>>4); | |
1715 | |
1716 for(i=0; i<16; i++){ | |
1717 ((uint32_t*)(src+i*stride))[0]= | |
1718 ((uint32_t*)(src+i*stride))[1]= | |
1719 ((uint32_t*)(src+i*stride))[2]= | |
1720 ((uint32_t*)(src+i*stride))[3]= dc; | |
1721 } | |
1722 } | |
1723 | |
1724 static void pred16x16_top_dc_c(uint8_t *src, int stride){ | |
1725 int i, dc=0; | |
1726 | |
1727 for(i=0;i<16; i++){ | |
1728 dc+= src[i-stride]; | |
1729 } | |
1730 dc= 0x01010101*((dc + 8)>>4); | |
1731 | |
1732 for(i=0; i<16; i++){ | |
1733 ((uint32_t*)(src+i*stride))[0]= | |
1734 ((uint32_t*)(src+i*stride))[1]= | |
1735 ((uint32_t*)(src+i*stride))[2]= | |
1736 ((uint32_t*)(src+i*stride))[3]= dc; | |
1737 } | |
1738 } | |
1739 | |
1740 static void pred16x16_128_dc_c(uint8_t *src, int stride){ | |
1741 int i; | |
1742 | |
1743 for(i=0; i<16; i++){ | |
1744 ((uint32_t*)(src+i*stride))[0]= | |
1745 ((uint32_t*)(src+i*stride))[1]= | |
1746 ((uint32_t*)(src+i*stride))[2]= | |
1747 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U; | |
1748 } | |
1749 } | |
1750 | |
1234 | 1751 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
|
1752 int i, j, k; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1753 int a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1754 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
|
1755 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
|
1756 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
|
1757 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
|
1758 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
|
1759 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
|
1760 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
|
1761 src1 += stride; src2 -= stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1762 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
|
1763 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
|
1764 } |
1234 | 1765 if(svq3){ |
1766 H = ( 5*(H/4) ) / 16; | |
1767 V = ( 5*(V/4) ) / 16; | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1768 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1769 /* required for 100% accuracy */ |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1770 i = H; H = V; V = i; |
1234 | 1771 }else{ |
1772 H = ( 5*H+32 ) >> 6; | |
1773 V = ( 5*V+32 ) >> 6; | |
1774 } | |
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1775 |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1776 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
|
1777 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
|
1778 int b = a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1779 a += V; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1780 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
|
1781 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
|
1782 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
|
1783 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
|
1784 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
|
1785 b += 4*H; |
1168 | 1786 } |
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1787 src += stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1788 } |
1168 | 1789 } |
1790 | |
1234 | 1791 static void pred16x16_plane_c(uint8_t *src, int stride){ |
1792 pred16x16_plane_compat_c(src, stride, 0); | |
1793 } | |
1794 | |
1168 | 1795 static void pred8x8_vertical_c(uint8_t *src, int stride){ |
1796 int i; | |
1797 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
1798 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
1799 | |
1800 for(i=0; i<8; i++){ | |
1801 ((uint32_t*)(src+i*stride))[0]= a; | |
1802 ((uint32_t*)(src+i*stride))[1]= b; | |
1803 } | |
1804 } | |
1805 | |
1806 static void pred8x8_horizontal_c(uint8_t *src, int stride){ | |
1807 int i; | |
1808 | |
1809 for(i=0; i<8; i++){ | |
1810 ((uint32_t*)(src+i*stride))[0]= | |
1811 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101; | |
1812 } | |
1813 } | |
1814 | |
1815 static void pred8x8_128_dc_c(uint8_t *src, int stride){ | |
1816 int i; | |
1817 | |
1818 for(i=0; i<4; i++){ | |
1819 ((uint32_t*)(src+i*stride))[0]= | |
1820 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; | |
1821 } | |
1822 for(i=4; i<8; i++){ | |
1823 ((uint32_t*)(src+i*stride))[0]= | |
1824 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; | |
1825 } | |
1826 } | |
1827 | |
1828 static void pred8x8_left_dc_c(uint8_t *src, int stride){ | |
1829 int i; | |
1830 int dc0, dc2; | |
1831 | |
1832 dc0=dc2=0; | |
1833 for(i=0;i<4; i++){ | |
1834 dc0+= src[-1+i*stride]; | |
1835 dc2+= src[-1+(i+4)*stride]; | |
1836 } | |
1837 dc0= 0x01010101*((dc0 + 2)>>2); | |
1838 dc2= 0x01010101*((dc2 + 2)>>2); | |
1839 | |
1840 for(i=0; i<4; i++){ | |
1841 ((uint32_t*)(src+i*stride))[0]= | |
1842 ((uint32_t*)(src+i*stride))[1]= dc0; | |
1843 } | |
1844 for(i=4; i<8; i++){ | |
1845 ((uint32_t*)(src+i*stride))[0]= | |
1846 ((uint32_t*)(src+i*stride))[1]= dc2; | |
1847 } | |
1848 } | |
1849 | |
1850 static void pred8x8_top_dc_c(uint8_t *src, int stride){ | |
1851 int i; | |
1852 int dc0, dc1; | |
1853 | |
1854 dc0=dc1=0; | |
1855 for(i=0;i<4; i++){ | |
1856 dc0+= src[i-stride]; | |
1857 dc1+= src[4+i-stride]; | |
1858 } | |
1859 dc0= 0x01010101*((dc0 + 2)>>2); | |
1860 dc1= 0x01010101*((dc1 + 2)>>2); | |
1861 | |
1862 for(i=0; i<4; i++){ | |
1863 ((uint32_t*)(src+i*stride))[0]= dc0; | |
1864 ((uint32_t*)(src+i*stride))[1]= dc1; | |
1865 } | |
1866 for(i=4; i<8; i++){ | |
1867 ((uint32_t*)(src+i*stride))[0]= dc0; | |
1868 ((uint32_t*)(src+i*stride))[1]= dc1; | |
1869 } | |
1870 } | |
1871 | |
1872 | |
1873 static void pred8x8_dc_c(uint8_t *src, int stride){ | |
1874 int i; | |
1875 int dc0, dc1, dc2, dc3; | |
1876 | |
1877 dc0=dc1=dc2=0; | |
1878 for(i=0;i<4; i++){ | |
1879 dc0+= src[-1+i*stride] + src[i-stride]; | |
1880 dc1+= src[4+i-stride]; | |
1881 dc2+= src[-1+(i+4)*stride]; | |
1882 } | |
1883 dc3= 0x01010101*((dc1 + dc2 + 4)>>3); | |
1884 dc0= 0x01010101*((dc0 + 4)>>3); | |
1885 dc1= 0x01010101*((dc1 + 2)>>2); | |
1886 dc2= 0x01010101*((dc2 + 2)>>2); | |
1887 | |
1888 for(i=0; i<4; i++){ | |
1889 ((uint32_t*)(src+i*stride))[0]= dc0; | |
1890 ((uint32_t*)(src+i*stride))[1]= dc1; | |
1891 } | |
1892 for(i=4; i<8; i++){ | |
1893 ((uint32_t*)(src+i*stride))[0]= dc2; | |
1894 ((uint32_t*)(src+i*stride))[1]= dc3; | |
1895 } | |
1896 } | |
1897 | |
1898 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
|
1899 int j, k; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1900 int a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1901 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
|
1902 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
|
1903 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
|
1904 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
|
1905 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
|
1906 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
|
1907 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
|
1908 src1 += stride; src2 -= stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1909 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
|
1910 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
|
1911 } |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1912 H = ( 17*H+16 ) >> 5; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1913 V = ( 17*V+16 ) >> 5; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1914 |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1915 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
|
1916 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
|
1917 int b = a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1918 a += V; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1919 src[0] = cm[ (b ) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1920 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
|
1921 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
|
1922 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
|
1923 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
|
1924 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
|
1925 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
|
1926 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
|
1927 src += stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1928 } |
1168 | 1929 } |
1930 | |
1931 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list, | |
1932 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
1933 int src_x_offset, int src_y_offset, | |
1934 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){ | |
1935 MpegEncContext * const s = &h->s; | |
1936 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8; | |
1937 const int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8; | |
1938 const int luma_xy= (mx&3) + ((my&3)<<2); | |
1939 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*s->linesize; | |
1940 uint8_t * src_cb= pic->data[1] + (mx>>3) + (my>>3)*s->uvlinesize; | |
1941 uint8_t * src_cr= pic->data[2] + (mx>>3) + (my>>3)*s->uvlinesize; | |
1942 int extra_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; //FIXME increase edge?, IMHO not worth it | |
1943 int extra_height= extra_width; | |
1944 int emu=0; | |
1945 const int full_mx= mx>>2; | |
1946 const int full_my= my>>2; | |
1947 | |
1948 assert(pic->data[0]); | |
1949 | |
1950 if(mx&7) extra_width -= 3; | |
1951 if(my&7) extra_height -= 3; | |
1952 | |
1953 if( full_mx < 0-extra_width | |
1954 || full_my < 0-extra_height | |
1955 || full_mx + 16/*FIXME*/ > s->width + extra_width | |
1956 || full_my + 16/*FIXME*/ > s->height + extra_height){ | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
1957 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 | 1958 src_y= s->edge_emu_buffer + 2 + 2*s->linesize; |
1959 emu=1; | |
1960 } | |
1961 | |
1962 qpix_op[luma_xy](dest_y, src_y, s->linesize); //FIXME try variable height perhaps? | |
1963 if(!square){ | |
1964 qpix_op[luma_xy](dest_y + delta, src_y + delta, s->linesize); | |
1965 } | |
1966 | |
1967 if(s->flags&CODEC_FLAG_GRAY) return; | |
1968 | |
1969 if(emu){ | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
1970 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 | 1971 src_cb= s->edge_emu_buffer; |
1972 } | |
1973 chroma_op(dest_cb, src_cb, s->uvlinesize, chroma_height, mx&7, my&7); | |
1974 | |
1975 if(emu){ | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
1976 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 | 1977 src_cr= s->edge_emu_buffer; |
1978 } | |
1979 chroma_op(dest_cr, src_cr, s->uvlinesize, chroma_height, mx&7, my&7); | |
1980 } | |
1981 | |
1982 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta, | |
1983 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
1984 int x_offset, int y_offset, | |
1985 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
1986 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
1987 int list0, int list1){ | |
1988 MpegEncContext * const s = &h->s; | |
1989 qpel_mc_func *qpix_op= qpix_put; | |
1990 h264_chroma_mc_func chroma_op= chroma_put; | |
1991 | |
1992 dest_y += 2*x_offset + 2*y_offset*s-> linesize; | |
1993 dest_cb += x_offset + y_offset*s->uvlinesize; | |
1994 dest_cr += x_offset + y_offset*s->uvlinesize; | |
1995 x_offset += 8*s->mb_x; | |
1996 y_offset += 8*s->mb_y; | |
1997 | |
1998 if(list0){ | |
1169 | 1999 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ]; |
1168 | 2000 mc_dir_part(h, ref, n, square, chroma_height, delta, 0, |
2001 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2002 qpix_op, chroma_op); | |
2003 | |
2004 qpix_op= qpix_avg; | |
2005 chroma_op= chroma_avg; | |
2006 } | |
2007 | |
2008 if(list1){ | |
1169 | 2009 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ]; |
1168 | 2010 mc_dir_part(h, ref, n, square, chroma_height, delta, 1, |
2011 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2012 qpix_op, chroma_op); | |
2013 } | |
2014 } | |
2015 | |
2016 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
2017 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put), | |
2018 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg)){ | |
2019 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
|
2020 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 2021 const int mb_type= s->current_picture.mb_type[mb_xy]; |
2022 | |
2023 assert(IS_INTER(mb_type)); | |
2024 | |
2025 if(IS_16X16(mb_type)){ | |
2026 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0, | |
2027 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0], | |
2028 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); | |
2029 }else if(IS_16X8(mb_type)){ | |
2030 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0, | |
2031 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
2032 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); | |
2033 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4, | |
2034 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
2035 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); | |
2036 }else if(IS_8X16(mb_type)){ | |
2037 mc_part(h, 0, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 0, 0, | |
2038 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
2039 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); | |
2040 mc_part(h, 4, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 4, 0, | |
2041 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
2042 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); | |
2043 }else{ | |
2044 int i; | |
2045 | |
2046 assert(IS_8X8(mb_type)); | |
2047 | |
2048 for(i=0; i<4; i++){ | |
2049 const int sub_mb_type= h->sub_mb_type[i]; | |
2050 const int n= 4*i; | |
2051 int x_offset= (i&1)<<2; | |
2052 int y_offset= (i&2)<<1; | |
2053 | |
2054 if(IS_SUB_8X8(sub_mb_type)){ | |
2055 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2056 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
2057 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
2058 }else if(IS_SUB_8X4(sub_mb_type)){ | |
2059 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2060 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
2061 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
2062 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2, | |
2063 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
2064 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
2065 }else if(IS_SUB_4X8(sub_mb_type)){ | |
2066 mc_part(h, n , 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2067 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
2068 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
2069 mc_part(h, n+1, 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset, | |
2070 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
2071 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
2072 }else{ | |
2073 int j; | |
2074 assert(IS_SUB_4X4(sub_mb_type)); | |
2075 for(j=0; j<4; j++){ | |
2076 int sub_x_offset= x_offset + 2*(j&1); | |
2077 int sub_y_offset= y_offset + (j&2); | |
2078 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset, | |
2079 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
2080 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
2081 } | |
2082 } | |
2083 } | |
2084 } | |
2085 } | |
2086 | |
2087 static void decode_init_vlc(H264Context *h){ | |
2088 static int done = 0; | |
2089 | |
2090 if (!done) { | |
2091 int i; | |
2092 done = 1; | |
2093 | |
2094 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5, | |
2095 &chroma_dc_coeff_token_len [0], 1, 1, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2096 &chroma_dc_coeff_token_bits[0], 1, 1, 1); |
1168 | 2097 |
2098 for(i=0; i<4; i++){ | |
2099 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17, | |
2100 &coeff_token_len [i][0], 1, 1, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2101 &coeff_token_bits[i][0], 1, 1, 1); |
1168 | 2102 } |
2103 | |
2104 for(i=0; i<3; i++){ | |
2105 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4, | |
2106 &chroma_dc_total_zeros_len [i][0], 1, 1, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2107 &chroma_dc_total_zeros_bits[i][0], 1, 1, 1); |
1168 | 2108 } |
2109 for(i=0; i<15; i++){ | |
2110 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16, | |
2111 &total_zeros_len [i][0], 1, 1, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2112 &total_zeros_bits[i][0], 1, 1, 1); |
1168 | 2113 } |
2114 | |
2115 for(i=0; i<6; i++){ | |
2116 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7, | |
2117 &run_len [i][0], 1, 1, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2118 &run_bits[i][0], 1, 1, 1); |
1168 | 2119 } |
2120 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16, | |
2121 &run_len [6][0], 1, 1, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2122 &run_bits[6][0], 1, 1, 1); |
1168 | 2123 } |
2124 } | |
2125 | |
2126 /** | |
2127 * Sets the intra prediction function pointers. | |
2128 */ | |
2129 static void init_pred_ptrs(H264Context *h){ | |
2130 // MpegEncContext * const s = &h->s; | |
2131 | |
2132 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; | |
2133 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; | |
2134 h->pred4x4[DC_PRED ]= pred4x4_dc_c; | |
2135 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c; | |
2136 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c; | |
2137 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c; | |
2138 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c; | |
2139 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c; | |
2140 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c; | |
2141 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c; | |
2142 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c; | |
2143 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; | |
2144 | |
2145 h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c; | |
2146 h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c; | |
2147 h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c; | |
2148 h->pred8x8[PLANE_PRED8x8 ]= pred8x8_plane_c; | |
2149 h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c; | |
2150 h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c; | |
2151 h->pred8x8[DC_128_PRED8x8 ]= pred8x8_128_dc_c; | |
2152 | |
2153 h->pred16x16[DC_PRED8x8 ]= pred16x16_dc_c; | |
2154 h->pred16x16[VERT_PRED8x8 ]= pred16x16_vertical_c; | |
2155 h->pred16x16[HOR_PRED8x8 ]= pred16x16_horizontal_c; | |
2156 h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c; | |
2157 h->pred16x16[LEFT_DC_PRED8x8]= pred16x16_left_dc_c; | |
2158 h->pred16x16[TOP_DC_PRED8x8 ]= pred16x16_top_dc_c; | |
2159 h->pred16x16[DC_128_PRED8x8 ]= pred16x16_128_dc_c; | |
2160 } | |
2161 | |
2162 static void free_tables(H264Context *h){ | |
2163 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
|
2164 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
|
2165 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
|
2166 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
|
2167 av_freep(&h->mvd_table[1]); |
1168 | 2168 av_freep(&h->non_zero_count); |
2169 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
|
2170 av_freep(&h->top_border); |
1168 | 2171 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
|
2172 |
1168 | 2173 av_freep(&h->mb2b_xy); |
2174 av_freep(&h->mb2b8_xy); | |
2175 } | |
2176 | |
2177 /** | |
2178 * allocates tables. | |
2179 * needs widzh/height | |
2180 */ | |
2181 static int alloc_tables(H264Context *h){ | |
2182 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
|
2183 const int big_mb_num= s->mb_stride * (s->mb_height+1); |
1168 | 2184 int x,y; |
2185 | |
2186 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
|
2187 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2188 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t)) |
1168 | 2189 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
|
2190 CHECKED_ALLOCZ(h->top_border , s->mb_width * (16+8+8) * sizeof(uint8_t)) |
2336 | 2191 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t)) |
1168 | 2192 |
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 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
|
2194 CHECKED_ALLOCZ(h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t)) |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2195 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
|
2196 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
|
2197 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2198 |
1168 | 2199 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
|
2200 h->slice_table= h->slice_table_base + s->mb_stride + 1; |
1168 | 2201 |
2202 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint16_t)); | |
2203 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint16_t)); | |
2204 for(y=0; y<s->mb_height; y++){ | |
2205 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
|
2206 const int mb_xy= x + y*s->mb_stride; |
1168 | 2207 const int b_xy = 4*x + 4*y*h->b_stride; |
2208 const int b8_xy= 2*x + 2*y*h->b8_stride; | |
2209 | |
2210 h->mb2b_xy [mb_xy]= b_xy; | |
2211 h->mb2b8_xy[mb_xy]= b8_xy; | |
2212 } | |
2213 } | |
2214 | |
2215 return 0; | |
2216 fail: | |
2217 free_tables(h); | |
2218 return -1; | |
2219 } | |
2220 | |
2221 static void common_init(H264Context *h){ | |
2222 MpegEncContext * const s = &h->s; | |
2223 | |
2224 s->width = s->avctx->width; | |
2225 s->height = s->avctx->height; | |
2226 s->codec_id= s->avctx->codec->id; | |
2227 | |
2228 init_pred_ptrs(h); | |
2229 | |
1698 | 2230 s->unrestricted_mv=1; |
1168 | 2231 s->decode=1; //FIXME |
2232 } | |
2233 | |
2234 static int decode_init(AVCodecContext *avctx){ | |
2235 H264Context *h= avctx->priv_data; | |
2236 MpegEncContext * const s = &h->s; | |
2237 | |
1892 | 2238 MPV_decode_defaults(s); |
2239 | |
1168 | 2240 s->avctx = avctx; |
2241 common_init(h); | |
2242 | |
2243 s->out_format = FMT_H264; | |
2244 s->workaround_bugs= avctx->workaround_bugs; | |
2245 | |
2246 // set defaults | |
2247 // s->decode_mb= ff_h263_decode_mb; | |
2248 s->low_delay= 1; | |
2249 avctx->pix_fmt= PIX_FMT_YUV420P; | |
2250 | |
2251 decode_init_vlc(h); | |
2252 | |
2384 | 2253 if(avctx->codec_tag != 0x31637661 && avctx->codec_tag != 0x31435641) // avc1 |
2227 | 2254 h->is_avc = 0; |
2255 else { | |
2256 if((avctx->extradata_size == 0) || (avctx->extradata == NULL)) { | |
2257 av_log(avctx, AV_LOG_ERROR, "AVC codec requires avcC data\n"); | |
2258 return -1; | |
2259 } | |
2260 h->is_avc = 1; | |
2261 h->got_avcC = 0; | |
2262 } | |
2263 | |
1168 | 2264 return 0; |
2265 } | |
2266 | |
2267 static void frame_start(H264Context *h){ | |
2268 MpegEncContext * const s = &h->s; | |
2269 int i; | |
2270 | |
2271 MPV_frame_start(s, s->avctx); | |
2272 ff_er_frame_start(s); | |
2273 h->mmco_index=0; | |
2274 | |
2275 assert(s->linesize && s->uvlinesize); | |
2276 | |
2277 for(i=0; i<16; i++){ | |
2278 h->block_offset[i]= 4*((scan8[i] - scan8[0])&7) + 4*s->linesize*((scan8[i] - scan8[0])>>3); | |
2279 h->chroma_subblock_offset[i]= 2*((scan8[i] - scan8[0])&7) + 2*s->uvlinesize*((scan8[i] - scan8[0])>>3); | |
2280 } | |
2281 for(i=0; i<4; i++){ | |
2282 h->block_offset[16+i]= | |
2283 h->block_offset[20+i]= 4*((scan8[i] - scan8[0])&7) + 4*s->uvlinesize*((scan8[i] - scan8[0])>>3); | |
2284 } | |
2285 | |
2286 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; | |
2287 } | |
2288 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2289 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
|
2290 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
|
2291 int i; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2292 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2293 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
|
2294 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
|
2295 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
|
2296 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2297 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
|
2298 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
|
2299 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
|
2300 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2301 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2302 *(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
|
2303 *(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
|
2304 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2305 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
|
2306 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
|
2307 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
|
2308 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
|
2309 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
|
2310 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
|
2311 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2312 *(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
|
2313 *(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
|
2314 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2315 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2316 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2317 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
|
2318 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
|
2319 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
|
2320 uint64_t temp64; |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2321 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
|
2322 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
|
2323 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2324 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
|
2325 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
|
2326 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
|
2327 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2328 #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
|
2329 t= a;\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2330 if(xchg)\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2331 a= b;\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2332 b= t; |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2333 |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2334 if(deblock_left){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2335 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
|
2336 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
|
2337 } |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2338 } |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2339 |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2340 if(deblock_top){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2341 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
|
2342 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
|
2343 } |
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 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
|
2346 if(deblock_left){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2347 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
|
2348 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
|
2349 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
|
2350 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2351 } |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2352 if(deblock_top){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2353 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
|
2354 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
|
2355 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2356 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2357 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2358 |
1168 | 2359 static void hl_decode_mb(H264Context *h){ |
2360 MpegEncContext * const s = &h->s; | |
2361 const int mb_x= s->mb_x; | |
2362 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
|
2363 const int mb_xy= mb_x + mb_y*s->mb_stride; |
1168 | 2364 const int mb_type= s->current_picture.mb_type[mb_xy]; |
2365 uint8_t *dest_y, *dest_cb, *dest_cr; | |
2366 int linesize, uvlinesize /*dct_offset*/; | |
2367 int i; | |
2368 | |
2369 if(!s->decode) | |
2370 return; | |
2371 | |
2372 if(s->mb_skiped){ | |
2373 } | |
2374 | |
2375 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; | |
2376 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
2377 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
2378 | |
2379 if (h->mb_field_decoding_flag) { | |
2380 linesize = s->linesize * 2; | |
2381 uvlinesize = s->uvlinesize * 2; | |
2382 if(mb_y&1){ //FIXME move out of this func? | |
2383 dest_y -= s->linesize*15; | |
2384 dest_cb-= s->linesize*7; | |
2385 dest_cr-= s->linesize*7; | |
2386 } | |
2387 } else { | |
2388 linesize = s->linesize; | |
2389 uvlinesize = s->uvlinesize; | |
2390 // dct_offset = s->linesize * 16; | |
2391 } | |
2392 | |
2393 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
|
2394 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
|
2395 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
|
2396 |
1168 | 2397 if(!(s->flags&CODEC_FLAG_GRAY)){ |
2398 h->pred8x8[ h->chroma_pred_mode ](dest_cb, uvlinesize); | |
2399 h->pred8x8[ h->chroma_pred_mode ](dest_cr, uvlinesize); | |
2400 } | |
2401 | |
2402 if(IS_INTRA4x4(mb_type)){ | |
2403 if(!s->encoding){ | |
2404 for(i=0; i<16; i++){ | |
2405 uint8_t * const ptr= dest_y + h->block_offset[i]; | |
2383 | 2406 uint8_t *topright; |
1168 | 2407 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ]; |
2408 int tr; | |
2409 | |
2383 | 2410 if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){ |
2411 const int topright_avail= (h->topright_samples_available<<i)&0x8000; | |
2412 assert(mb_y || linesize <= h->block_offset[i]); | |
2413 if(!topright_avail){ | |
2414 tr= ptr[3 - linesize]*0x01010101; | |
2415 topright= (uint8_t*) &tr; | |
2416 }else if(i==5 && h->deblocking_filter){ | |
2417 tr= *(uint32_t*)h->top_border[mb_x+1]; | |
2418 topright= (uint8_t*) &tr; | |
2419 }else | |
2420 topright= ptr + 4 - linesize; | |
2421 }else | |
2422 topright= NULL; | |
1168 | 2423 |
2424 h->pred4x4[ dir ](ptr, topright, linesize); | |
1234 | 2425 if(h->non_zero_count_cache[ scan8[i] ]){ |
2426 if(s->codec_id == CODEC_ID_H264) | |
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
2427 s->dsp.h264_idct_add(ptr, h->mb + i*16, linesize); |
1234 | 2428 else |
2429 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0); | |
2430 } | |
1168 | 2431 } |
2432 } | |
2433 }else{ | |
2434 h->pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize); | |
1234 | 2435 if(s->codec_id == CODEC_ID_H264) |
2436 h264_luma_dc_dequant_idct_c(h->mb, s->qscale); | |
2437 else | |
2438 svq3_luma_dc_dequant_idct_c(h->mb, s->qscale); | |
1168 | 2439 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2440 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
|
2441 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0); |
1234 | 2442 }else if(s->codec_id == CODEC_ID_H264){ |
1168 | 2443 hl_motion(h, dest_y, dest_cb, dest_cr, |
2444 s->dsp.put_h264_qpel_pixels_tab, s->dsp.put_h264_chroma_pixels_tab, | |
2445 s->dsp.avg_h264_qpel_pixels_tab, s->dsp.avg_h264_chroma_pixels_tab); | |
2446 } | |
2447 | |
2448 | |
2449 if(!IS_INTRA4x4(mb_type)){ | |
1250 | 2450 if(s->codec_id == CODEC_ID_H264){ |
2451 for(i=0; i<16; i++){ | |
2452 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below | |
2453 uint8_t * const ptr= dest_y + h->block_offset[i]; | |
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
2454 s->dsp.h264_idct_add(ptr, h->mb + i*16, linesize); |
1250 | 2455 } |
2456 } | |
2457 }else{ | |
2458 for(i=0; i<16; i++){ | |
2459 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below | |
2460 uint8_t * const ptr= dest_y + h->block_offset[i]; | |
1234 | 2461 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); |
1250 | 2462 } |
1168 | 2463 } |
2464 } | |
2465 } | |
2466 | |
2467 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
2468 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp); | |
2469 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp); | |
1250 | 2470 if(s->codec_id == CODEC_ID_H264){ |
2471 for(i=16; i<16+4; i++){ | |
2472 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ | |
2473 uint8_t * const ptr= dest_cb + h->block_offset[i]; | |
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
2474 s->dsp.h264_idct_add(ptr, h->mb + i*16, uvlinesize); |
1250 | 2475 } |
2476 } | |
2477 for(i=20; i<20+4; i++){ | |
2478 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ | |
2479 uint8_t * const ptr= dest_cr + h->block_offset[i]; | |
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
2480 s->dsp.h264_idct_add(ptr, h->mb + i*16, uvlinesize); |
1250 | 2481 } |
1168 | 2482 } |
1250 | 2483 }else{ |
2484 for(i=16; i<16+4; i++){ | |
2485 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ | |
2486 uint8_t * const ptr= dest_cb + h->block_offset[i]; | |
1234 | 2487 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2); |
1250 | 2488 } |
2489 } | |
2490 for(i=20; i<20+4; i++){ | |
2491 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ | |
2492 uint8_t * const ptr= dest_cr + h->block_offset[i]; | |
2493 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2); | |
2494 } | |
1168 | 2495 } |
2496 } | |
2497 } | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2498 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
|
2499 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
|
2500 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
|
2501 } |
1168 | 2502 } |
2503 | |
2504 /** | |
2505 * fills the default_ref_list. | |
2506 */ | |
2507 static int fill_default_ref_list(H264Context *h){ | |
2508 MpegEncContext * const s = &h->s; | |
2509 int i; | |
2510 Picture sorted_short_ref[16]; | |
2511 | |
2512 if(h->slice_type==B_TYPE){ | |
2513 int out_i; | |
2514 int limit= -1; | |
2515 | |
2516 for(out_i=0; out_i<h->short_ref_count; out_i++){ | |
2517 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
|
2518 int best_poc=INT_MAX; |
1168 | 2519 |
2520 for(i=0; i<h->short_ref_count; i++){ | |
2521 const int poc= h->short_ref[i]->poc; | |
2522 if(poc > limit && poc < best_poc){ | |
2523 best_poc= poc; | |
2524 best_i= i; | |
2525 } | |
2526 } | |
2527 | |
2528 assert(best_i != -1); | |
2529 | |
2530 limit= best_poc; | |
2531 sorted_short_ref[out_i]= *h->short_ref[best_i]; | |
2532 } | |
2533 } | |
2534 | |
2535 if(s->picture_structure == PICT_FRAME){ | |
2536 if(h->slice_type==B_TYPE){ | |
2537 const int current_poc= s->current_picture_ptr->poc; | |
2538 int list; | |
2539 | |
2540 for(list=0; list<2; list++){ | |
2541 int index=0; | |
2542 | |
2543 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++){ | |
2544 const int i2= list ? h->short_ref_count - i - 1 : i; | |
2545 const int poc= sorted_short_ref[i2].poc; | |
2546 | |
2547 if(sorted_short_ref[i2].reference != 3) continue; //FIXME refernce field shit | |
2548 | |
2549 if((list==1 && poc > current_poc) || (list==0 && poc < current_poc)){ | |
2550 h->default_ref_list[list][index ]= sorted_short_ref[i2]; | |
2551 h->default_ref_list[list][index++].pic_id= sorted_short_ref[i2].frame_num; | |
2552 } | |
2553 } | |
2554 | |
2555 for(i=0; i<h->long_ref_count && index < h->ref_count[ list ]; i++){ | |
2556 if(h->long_ref[i]->reference != 3) continue; | |
2557 | |
2558 h->default_ref_list[ list ][index ]= *h->long_ref[i]; | |
2559 h->default_ref_list[ list ][index++].pic_id= i;; | |
2560 } | |
2561 | |
2562 if(h->long_ref_count > 1 && h->short_ref_count==0){ | |
2563 Picture temp= h->default_ref_list[1][0]; | |
2564 h->default_ref_list[1][0] = h->default_ref_list[1][1]; | |
2565 h->default_ref_list[1][0] = temp; | |
2566 } | |
2567 | |
2568 if(index < h->ref_count[ list ]) | |
2569 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index)); | |
2570 } | |
2571 }else{ | |
2572 int index=0; | |
2573 for(i=0; i<h->short_ref_count && index < h->ref_count[0]; i++){ | |
2574 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit | |
2575 h->default_ref_list[0][index ]= *h->short_ref[i]; | |
2576 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num; | |
2577 } | |
2578 for(i=0; i<h->long_ref_count && index < h->ref_count[0]; i++){ | |
2579 if(h->long_ref[i]->reference != 3) continue; | |
2580 h->default_ref_list[0][index ]= *h->long_ref[i]; | |
2581 h->default_ref_list[0][index++].pic_id= i;; | |
2582 } | |
2583 if(index < h->ref_count[0]) | |
2584 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index)); | |
2585 } | |
2586 }else{ //FIELD | |
2587 if(h->slice_type==B_TYPE){ | |
2588 }else{ | |
2589 //FIXME second field balh | |
2590 } | |
2591 } | |
2592 return 0; | |
2593 } | |
2594 | |
2595 static int decode_ref_pic_list_reordering(H264Context *h){ | |
2596 MpegEncContext * const s = &h->s; | |
2597 int list; | |
2598 | |
2599 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move beofre func | |
2600 | |
2601 for(list=0; list<2; list++){ | |
2602 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]); | |
2603 | |
2604 if(get_bits1(&s->gb)){ | |
2605 int pred= h->curr_pic_num; | |
2606 int index; | |
2607 | |
2608 for(index=0; ; index++){ | |
2609 int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb); | |
2610 int pic_id; | |
2611 int i; | |
2612 | |
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
2613 if(reordering_of_pic_nums_idc==3) |
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
2614 break; |
1168 | 2615 |
2616 if(index >= h->ref_count[list]){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2617 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n"); |
1168 | 2618 return -1; |
2619 } | |
2620 | |
2621 if(reordering_of_pic_nums_idc<3){ | |
2622 if(reordering_of_pic_nums_idc<2){ | |
2623 const int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1; | |
2624 | |
2625 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
|
2626 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n"); |
1168 | 2627 return -1; |
2628 } | |
2629 | |
2630 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num; | |
2631 else pred+= abs_diff_pic_num; | |
2632 pred &= h->max_pic_num - 1; | |
2633 | |
2634 for(i= h->ref_count[list]-1; i>=index; i--){ | |
2635 if(h->ref_list[list][i].pic_id == pred && h->ref_list[list][i].long_ref==0) | |
2636 break; | |
2637 } | |
2638 }else{ | |
2639 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx | |
2640 | |
2641 for(i= h->ref_count[list]-1; i>=index; i--){ | |
2642 if(h->ref_list[list][i].pic_id == pic_id && h->ref_list[list][i].long_ref==1) | |
2643 break; | |
2644 } | |
2645 } | |
2646 | |
2647 if(i < index){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2648 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n"); |
1168 | 2649 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME |
2650 }else if(i > index){ | |
2651 Picture tmp= h->ref_list[list][i]; | |
2652 for(; i>index; i--){ | |
2653 h->ref_list[list][i]= h->ref_list[list][i-1]; | |
2654 } | |
2655 h->ref_list[list][index]= tmp; | |
2656 } | |
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
2657 }else{ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2658 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n"); |
1168 | 2659 return -1; |
2660 } | |
2661 } | |
2662 } | |
2663 | |
2664 if(h->slice_type!=B_TYPE) break; | |
2665 } | |
2666 return 0; | |
2667 } | |
2668 | |
2669 static int pred_weight_table(H264Context *h){ | |
2670 MpegEncContext * const s = &h->s; | |
2671 int list, i; | |
2672 | |
2673 h->luma_log2_weight_denom= get_ue_golomb(&s->gb); | |
2674 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb); | |
2675 | |
2676 for(list=0; list<2; list++){ | |
2677 for(i=0; i<h->ref_count[list]; i++){ | |
2678 int luma_weight_flag, chroma_weight_flag; | |
2679 | |
2680 luma_weight_flag= get_bits1(&s->gb); | |
2681 if(luma_weight_flag){ | |
2682 h->luma_weight[list][i]= get_se_golomb(&s->gb); | |
2683 h->luma_offset[list][i]= get_se_golomb(&s->gb); | |
2684 } | |
2685 | |
2686 chroma_weight_flag= get_bits1(&s->gb); | |
2687 if(chroma_weight_flag){ | |
2688 int j; | |
2689 for(j=0; j<2; j++){ | |
2690 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb); | |
2691 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb); | |
2692 } | |
2693 } | |
2694 } | |
2695 if(h->slice_type != B_TYPE) break; | |
2696 } | |
2697 return 0; | |
2698 } | |
2699 | |
2700 /** | |
2392 | 2701 * instantaneous decoder refresh. |
1168 | 2702 */ |
2703 static void idr(H264Context *h){ | |
2704 int i; | |
2705 | |
2706 for(i=0; i<h->long_ref_count; i++){ | |
2707 h->long_ref[i]->reference=0; | |
2708 h->long_ref[i]= NULL; | |
2709 } | |
2710 h->long_ref_count=0; | |
2711 | |
2712 for(i=0; i<h->short_ref_count; i++){ | |
2713 h->short_ref[i]->reference=0; | |
2714 h->short_ref[i]= NULL; | |
2715 } | |
2716 h->short_ref_count=0; | |
2717 } | |
2718 | |
2719 /** | |
2720 * | |
2721 * @return the removed picture or NULL if an error occures | |
2722 */ | |
2723 static Picture * remove_short(H264Context *h, int frame_num){ | |
1169 | 2724 MpegEncContext * const s = &h->s; |
1168 | 2725 int i; |
2726 | |
1169 | 2727 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
|
2728 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count); |
1169 | 2729 |
1168 | 2730 for(i=0; i<h->short_ref_count; i++){ |
2731 Picture *pic= h->short_ref[i]; | |
1169 | 2732 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
|
2733 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic); |
1168 | 2734 if(pic->frame_num == frame_num){ |
2735 h->short_ref[i]= NULL; | |
2736 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*)); | |
2737 h->short_ref_count--; | |
2738 return pic; | |
2739 } | |
2740 } | |
2741 return NULL; | |
2742 } | |
2743 | |
2744 /** | |
2745 * | |
2746 * @return the removed picture or NULL if an error occures | |
2747 */ | |
2748 static Picture * remove_long(H264Context *h, int i){ | |
2749 Picture *pic; | |
2750 | |
2751 if(i >= h->long_ref_count) return NULL; | |
2752 pic= h->long_ref[i]; | |
2753 if(pic==NULL) return NULL; | |
2754 | |
2755 h->long_ref[i]= NULL; | |
2756 memmove(&h->long_ref[i], &h->long_ref[i+1], (h->long_ref_count - i - 1)*sizeof(Picture*)); | |
2757 h->long_ref_count--; | |
2758 | |
2759 return pic; | |
2760 } | |
2761 | |
2762 /** | |
2763 * Executes the reference picture marking (memory management control operations). | |
2764 */ | |
2765 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ | |
2766 MpegEncContext * const s = &h->s; | |
2767 int i; | |
2768 int current_is_long=0; | |
2769 Picture *pic; | |
2770 | |
2771 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
|
2772 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n"); |
1168 | 2773 |
2774 for(i=0; i<mmco_count; i++){ | |
2775 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
|
2776 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 | 2777 |
2778 switch(mmco[i].opcode){ | |
2779 case MMCO_SHORT2UNUSED: | |
2780 pic= remove_short(h, mmco[i].short_frame_num); | |
2781 if(pic==NULL) return -1; | |
2782 pic->reference= 0; | |
2783 break; | |
2784 case MMCO_SHORT2LONG: | |
2785 pic= remove_long(h, mmco[i].long_index); | |
2786 if(pic) pic->reference=0; | |
2787 | |
2788 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num); | |
2789 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
2790 break; | |
2791 case MMCO_LONG2UNUSED: | |
2792 pic= remove_long(h, mmco[i].long_index); | |
2793 if(pic==NULL) return -1; | |
2794 pic->reference= 0; | |
2795 break; | |
2796 case MMCO_LONG: | |
2797 pic= remove_long(h, mmco[i].long_index); | |
2798 if(pic) pic->reference=0; | |
2799 | |
2800 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr; | |
2801 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
2802 h->long_ref_count++; | |
2803 | |
2804 current_is_long=1; | |
2805 break; | |
2806 case MMCO_SET_MAX_LONG: | |
2807 assert(mmco[i].long_index <= 16); | |
2808 while(mmco[i].long_index < h->long_ref_count){ | |
2809 pic= remove_long(h, mmco[i].long_index); | |
2810 pic->reference=0; | |
2811 } | |
2812 while(mmco[i].long_index > h->long_ref_count){ | |
2813 h->long_ref[ h->long_ref_count++ ]= NULL; | |
2814 } | |
2815 break; | |
2816 case MMCO_RESET: | |
2817 while(h->short_ref_count){ | |
2818 pic= remove_short(h, h->short_ref[0]->frame_num); | |
2819 pic->reference=0; | |
2820 } | |
2821 while(h->long_ref_count){ | |
2822 pic= remove_long(h, h->long_ref_count-1); | |
2823 pic->reference=0; | |
2824 } | |
2825 break; | |
2826 default: assert(0); | |
2827 } | |
2828 } | |
2829 | |
2830 if(!current_is_long){ | |
2831 pic= remove_short(h, s->current_picture_ptr->frame_num); | |
2832 if(pic){ | |
2833 pic->reference=0; | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2834 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n"); |
1168 | 2835 } |
2836 | |
2837 if(h->short_ref_count) | |
1169 | 2838 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*)); |
2839 | |
2840 h->short_ref[0]= s->current_picture_ptr; | |
1168 | 2841 h->short_ref[0]->long_ref=0; |
2842 h->short_ref_count++; | |
2843 } | |
2844 | |
2845 return 0; | |
2846 } | |
2847 | |
2848 static int decode_ref_pic_marking(H264Context *h){ | |
2849 MpegEncContext * const s = &h->s; | |
2850 int i; | |
2851 | |
2852 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields | |
2853 s->broken_link= get_bits1(&s->gb) -1; | |
2854 h->mmco[0].long_index= get_bits1(&s->gb) - 1; // current_long_term_idx | |
2855 if(h->mmco[0].long_index == -1) | |
2856 h->mmco_index= 0; | |
2857 else{ | |
2858 h->mmco[0].opcode= MMCO_LONG; | |
2859 h->mmco_index= 1; | |
2860 } | |
2861 }else{ | |
2862 if(get_bits1(&s->gb)){ // adaptive_ref_pic_marking_mode_flag | |
2863 for(i= h->mmco_index; i<MAX_MMCO_COUNT; i++) { | |
2864 MMCOOpcode opcode= get_ue_golomb(&s->gb);; | |
2865 | |
2866 h->mmco[i].opcode= opcode; | |
2867 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){ | |
2868 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 | |
2869 /* if(h->mmco[i].short_frame_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_frame_num ] == NULL){ | |
2870 fprintf(stderr, "illegal short ref in memory management control operation %d\n", mmco); | |
2871 return -1; | |
2872 }*/ | |
2873 } | |
2874 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){ | |
2875 h->mmco[i].long_index= get_ue_golomb(&s->gb); | |
2876 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
|
2877 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); |
1168 | 2878 return -1; |
2879 } | |
2880 } | |
2881 | |
2882 if(opcode > MMCO_LONG){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2883 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); |
1168 | 2884 return -1; |
2885 } | |
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
|
2886 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
|
2887 break; |
1168 | 2888 } |
2889 h->mmco_index= i; | |
2890 }else{ | |
2891 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count); | |
2892 | |
2893 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields | |
2894 h->mmco[0].opcode= MMCO_SHORT2UNUSED; | |
2895 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num; | |
2896 h->mmco_index= 1; | |
2897 }else | |
2898 h->mmco_index= 0; | |
2899 } | |
2900 } | |
2901 | |
2902 return 0; | |
2903 } | |
2904 | |
2905 static int init_poc(H264Context *h){ | |
2906 MpegEncContext * const s = &h->s; | |
2907 const int max_frame_num= 1<<h->sps.log2_max_frame_num; | |
2908 int field_poc[2]; | |
2909 | |
2910 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
2911 h->frame_num_offset= 0; | |
2912 }else{ | |
2913 if(h->frame_num < h->prev_frame_num) | |
2914 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num; | |
2915 else | |
2916 h->frame_num_offset= h->prev_frame_num_offset; | |
2917 } | |
2918 | |
2919 if(h->sps.poc_type==0){ | |
2920 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb; | |
2921 | |
2922 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2) | |
2923 h->poc_msb = h->prev_poc_msb + max_poc_lsb; | |
2924 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2) | |
2925 h->poc_msb = h->prev_poc_msb - max_poc_lsb; | |
2926 else | |
2927 h->poc_msb = h->prev_poc_msb; | |
2928 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb); | |
2929 field_poc[0] = | |
2930 field_poc[1] = h->poc_msb + h->poc_lsb; | |
2931 if(s->picture_structure == PICT_FRAME) | |
2932 field_poc[1] += h->delta_poc_bottom; | |
2933 }else if(h->sps.poc_type==1){ | |
2934 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc; | |
2935 int i; | |
2936 | |
2937 if(h->sps.poc_cycle_length != 0) | |
2938 abs_frame_num = h->frame_num_offset + h->frame_num; | |
2939 else | |
2940 abs_frame_num = 0; | |
2941 | |
2942 if(h->nal_ref_idc==0 && abs_frame_num > 0) | |
2943 abs_frame_num--; | |
2944 | |
2945 expected_delta_per_poc_cycle = 0; | |
2946 for(i=0; i < h->sps.poc_cycle_length; i++) | |
2947 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse | |
2948 | |
2949 if(abs_frame_num > 0){ | |
2950 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length; | |
2951 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length; | |
2952 | |
2953 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle; | |
2954 for(i = 0; i <= frame_num_in_poc_cycle; i++) | |
2955 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ]; | |
2956 } else | |
2957 expectedpoc = 0; | |
2958 | |
2959 if(h->nal_ref_idc == 0) | |
2960 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic; | |
2961 | |
2962 field_poc[0] = expectedpoc + h->delta_poc[0]; | |
2963 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field; | |
2964 | |
2965 if(s->picture_structure == PICT_FRAME) | |
2966 field_poc[1] += h->delta_poc[1]; | |
2967 }else{ | |
2968 int poc; | |
2969 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
2970 poc= 0; | |
2971 }else{ | |
2972 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num); | |
2973 else poc= 2*(h->frame_num_offset + h->frame_num) - 1; | |
2974 } | |
2975 field_poc[0]= poc; | |
2976 field_poc[1]= poc; | |
2977 } | |
2978 | |
2979 if(s->picture_structure != PICT_BOTTOM_FIELD) | |
2980 s->current_picture_ptr->field_poc[0]= field_poc[0]; | |
2981 if(s->picture_structure != PICT_TOP_FIELD) | |
2982 s->current_picture_ptr->field_poc[1]= field_poc[1]; | |
2983 if(s->picture_structure == PICT_FRAME) // FIXME field pix? | |
2984 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]); | |
2985 | |
2986 return 0; | |
2987 } | |
2988 | |
2989 /** | |
2990 * decodes a slice header. | |
2991 * this will allso call MPV_common_init() and frame_start() as needed | |
2992 */ | |
2993 static int decode_slice_header(H264Context *h){ | |
2994 MpegEncContext * const s = &h->s; | |
2995 int first_mb_in_slice, pps_id; | |
2996 int num_ref_idx_active_override_flag; | |
2997 static const uint8_t slice_type_map[5]= {P_TYPE, B_TYPE, I_TYPE, SP_TYPE, SI_TYPE}; | |
2998 | |
2999 s->current_picture.reference= h->nal_ref_idc != 0; | |
3000 | |
3001 first_mb_in_slice= get_ue_golomb(&s->gb); | |
3002 | |
3003 h->slice_type= get_ue_golomb(&s->gb); | |
3004 if(h->slice_type > 9){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3005 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); |
2392 | 3006 return -1; |
1168 | 3007 } |
3008 if(h->slice_type > 4){ | |
3009 h->slice_type -= 5; | |
3010 h->slice_type_fixed=1; | |
3011 }else | |
3012 h->slice_type_fixed=0; | |
3013 | |
3014 h->slice_type= slice_type_map[ h->slice_type ]; | |
3015 | |
3016 s->pict_type= h->slice_type; // to make a few old func happy, its wrong though | |
3017 | |
3018 pps_id= get_ue_golomb(&s->gb); | |
3019 if(pps_id>255){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3020 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n"); |
1168 | 3021 return -1; |
3022 } | |
3023 h->pps= h->pps_buffer[pps_id]; | |
1174 | 3024 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
|
3025 av_log(h->s.avctx, AV_LOG_ERROR, "non existing PPS referenced\n"); |
1174 | 3026 return -1; |
3027 } | |
3028 | |
1168 | 3029 h->sps= h->sps_buffer[ h->pps.sps_id ]; |
1174 | 3030 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
|
3031 av_log(h->s.avctx, AV_LOG_ERROR, "non existing SPS referenced\n"); |
1174 | 3032 return -1; |
3033 } | |
1168 | 3034 |
3035 s->mb_width= h->sps.mb_width; | |
3036 s->mb_height= h->sps.mb_height; | |
3037 | |
3038 h->b_stride= s->mb_width*4; | |
3039 h->b8_stride= s->mb_width*2; | |
3040 | |
2392 | 3041 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width; |
3042 s->resync_mb_y = s->mb_y = first_mb_in_slice / s->mb_width; //FIXME AFFW | |
1168 | 3043 |
1371 | 3044 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right ); |
1168 | 3045 if(h->sps.frame_mbs_only_flag) |
1371 | 3046 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom); |
1168 | 3047 else |
1371 | 3048 s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck |
1168 | 3049 |
3050 if (s->context_initialized | |
1548 | 3051 && ( s->width != s->avctx->width || s->height != s->avctx->height)) { |
1168 | 3052 free_tables(h); |
3053 MPV_common_end(s); | |
3054 } | |
3055 if (!s->context_initialized) { | |
3056 if (MPV_common_init(s) < 0) | |
3057 return -1; | |
3058 | |
3059 alloc_tables(h); | |
3060 | |
3061 s->avctx->width = s->width; | |
3062 s->avctx->height = s->height; | |
1548 | 3063 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
|
3064 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
3065 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
|
3066 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
|
3067 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
|
3068 } |
1168 | 3069 } |
3070 | |
2392 | 3071 if(h->slice_num == 0){ |
1168 | 3072 frame_start(h); |
3073 } | |
3074 | |
1169 | 3075 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup |
1168 | 3076 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num); |
3077 | |
3078 if(h->sps.frame_mbs_only_flag){ | |
3079 s->picture_structure= PICT_FRAME; | |
3080 }else{ | |
3081 if(get_bits1(&s->gb)) //field_pic_flag | |
3082 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag | |
3083 else | |
3084 s->picture_structure= PICT_FRAME; | |
3085 } | |
3086 | |
3087 if(s->picture_structure==PICT_FRAME){ | |
3088 h->curr_pic_num= h->frame_num; | |
3089 h->max_pic_num= 1<< h->sps.log2_max_frame_num; | |
3090 }else{ | |
3091 h->curr_pic_num= 2*h->frame_num; | |
3092 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); | |
3093 } | |
3094 | |
3095 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
1453 | 3096 get_ue_golomb(&s->gb); /* idr_pic_id */ |
1168 | 3097 } |
3098 | |
3099 if(h->sps.poc_type==0){ | |
3100 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb); | |
3101 | |
3102 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){ | |
3103 h->delta_poc_bottom= get_se_golomb(&s->gb); | |
3104 } | |
3105 } | |
3106 | |
3107 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){ | |
3108 h->delta_poc[0]= get_se_golomb(&s->gb); | |
3109 | |
3110 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME) | |
3111 h->delta_poc[1]= get_se_golomb(&s->gb); | |
3112 } | |
3113 | |
3114 init_poc(h); | |
3115 | |
3116 if(h->pps.redundant_pic_cnt_present){ | |
3117 h->redundant_pic_count= get_ue_golomb(&s->gb); | |
3118 } | |
3119 | |
3120 //set defaults, might be overriden a few line later | |
3121 h->ref_count[0]= h->pps.ref_count[0]; | |
3122 h->ref_count[1]= h->pps.ref_count[1]; | |
3123 | |
3124 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){ | |
3125 if(h->slice_type == B_TYPE){ | |
3126 h->direct_spatial_mv_pred= get_bits1(&s->gb); | |
3127 } | |
3128 num_ref_idx_active_override_flag= get_bits1(&s->gb); | |
3129 | |
3130 if(num_ref_idx_active_override_flag){ | |
3131 h->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
3132 if(h->slice_type==B_TYPE) | |
3133 h->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
3134 | |
3135 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
|
3136 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n"); |
1168 | 3137 return -1; |
3138 } | |
3139 } | |
3140 } | |
3141 | |
2392 | 3142 if(h->slice_num == 0){ |
1168 | 3143 fill_default_ref_list(h); |
3144 } | |
3145 | |
3146 decode_ref_pic_list_reordering(h); | |
3147 | |
3148 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE )) | |
3149 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) ) | |
3150 pred_weight_table(h); | |
3151 | |
3152 if(s->current_picture.reference) | |
3153 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
|
3154 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3155 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
|
3156 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
|
3157 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3158 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
|
3159 s->qscale = h->pps.init_qp + get_se_golomb(&s->gb); |
1898 | 3160 if(s->qscale<0 || s->qscale>51){ |
3161 av_log(s->avctx, AV_LOG_ERROR, "QP %d out of range\n", s->qscale); | |
3162 return -1; | |
3163 } | |
1168 | 3164 //FIXME qscale / qp ... stuff |
3165 if(h->slice_type == SP_TYPE){ | |
1453 | 3166 get_bits1(&s->gb); /* sp_for_switch_flag */ |
1168 | 3167 } |
3168 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){ | |
1453 | 3169 get_se_golomb(&s->gb); /* slice_qs_delta */ |
1168 | 3170 } |
3171 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3172 h->deblocking_filter = 1; |
1898 | 3173 h->slice_alpha_c0_offset = 0; |
3174 h->slice_beta_offset = 0; | |
1168 | 3175 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
|
3176 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
|
3177 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
|
3178 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
|
3179 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3180 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
|
3181 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
|
3182 h->slice_beta_offset = get_se_golomb(&s->gb) << 1; |
1168 | 3183 } |
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
|
3184 } |
1168 | 3185 |
3186 #if 0 //FMO | |
3187 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5) | |
3188 slice_group_change_cycle= get_bits(&s->gb, ?); | |
3189 #endif | |
3190 | |
2392 | 3191 h->slice_num++; |
3192 | |
1168 | 3193 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
2392 | 3194 av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d mb:%d %c pps:%d frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d\n", |
3195 h->slice_num, first_mb_in_slice, | |
1264 | 3196 av_get_pict_type_char(h->slice_type), |
1168 | 3197 pps_id, h->frame_num, |
3198 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], | |
3199 h->ref_count[0], h->ref_count[1], | |
3200 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
|
3201 h->deblocking_filter |
1168 | 3202 ); |
3203 } | |
3204 | |
3205 return 0; | |
3206 } | |
3207 | |
3208 /** | |
3209 * | |
3210 */ | |
3211 static inline int get_level_prefix(GetBitContext *gb){ | |
3212 unsigned int buf; | |
3213 int log; | |
3214 | |
3215 OPEN_READER(re, gb); | |
3216 UPDATE_CACHE(re, gb); | |
3217 buf=GET_CACHE(re, gb); | |
3218 | |
3219 log= 32 - av_log2(buf); | |
3220 #ifdef TRACE | |
3221 print_bin(buf>>(32-log), log); | |
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
3222 av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d lpr @%5d in %s get_level_prefix\n", buf>>(32-log), log, log-1, get_bits_count(gb), __FILE__); |
1168 | 3223 #endif |
3224 | |
3225 LAST_SKIP_BITS(re, gb, log); | |
3226 CLOSE_READER(re, gb); | |
3227 | |
3228 return log-1; | |
3229 } | |
3230 | |
3231 /** | |
3232 * decodes a residual block. | |
3233 * @param n block index | |
3234 * @param scantable scantable | |
3235 * @param max_coeff number of coefficients in the block | |
3236 * @return <0 if an error occured | |
3237 */ | |
3238 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, int qp, int max_coeff){ | |
3239 MpegEncContext * const s = &h->s; | |
3240 const uint16_t *qmul= dequant_coeff[qp]; | |
3241 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}; | |
3242 int level[16], run[16]; | |
3243 int suffix_length, zeros_left, coeff_num, coeff_token, total_coeff, i, trailing_ones; | |
3244 | |
3245 //FIXME put trailing_onex into the context | |
3246 | |
3247 if(n == CHROMA_DC_BLOCK_INDEX){ | |
3248 coeff_token= get_vlc2(gb, chroma_dc_coeff_token_vlc.table, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 1); | |
3249 total_coeff= coeff_token>>2; | |
3250 }else{ | |
3251 if(n == LUMA_DC_BLOCK_INDEX){ | |
3252 total_coeff= pred_non_zero_count(h, 0); | |
3253 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
3254 total_coeff= coeff_token>>2; | |
3255 }else{ | |
3256 total_coeff= pred_non_zero_count(h, n); | |
3257 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
3258 total_coeff= coeff_token>>2; | |
3259 h->non_zero_count_cache[ scan8[n] ]= total_coeff; | |
3260 } | |
3261 } | |
3262 | |
3263 //FIXME set last_non_zero? | |
3264 | |
3265 if(total_coeff==0) | |
3266 return 0; | |
3267 | |
3268 trailing_ones= coeff_token&3; | |
1170 | 3269 tprintf("trailing:%d, total:%d\n", trailing_ones, total_coeff); |
1168 | 3270 assert(total_coeff<=16); |
3271 | |
3272 for(i=0; i<trailing_ones; i++){ | |
3273 level[i]= 1 - 2*get_bits1(gb); | |
3274 } | |
3275 | |
3276 suffix_length= total_coeff > 10 && trailing_ones < 3; | |
3277 | |
3278 for(; i<total_coeff; i++){ | |
3279 const int prefix= get_level_prefix(gb); | |
3280 int level_code, mask; | |
3281 | |
3282 if(prefix<14){ //FIXME try to build a large unified VLC table for all this | |
3283 if(suffix_length) | |
3284 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
3285 else | |
3286 level_code= (prefix<<suffix_length); //part | |
3287 }else if(prefix==14){ | |
3288 if(suffix_length) | |
3289 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
3290 else | |
3291 level_code= prefix + get_bits(gb, 4); //part | |
3292 }else if(prefix==15){ | |
3293 level_code= (prefix<<suffix_length) + get_bits(gb, 12); //part | |
3294 if(suffix_length==0) level_code+=15; //FIXME doesnt make (much)sense | |
3295 }else{ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3296 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); |
1168 | 3297 return -1; |
3298 } | |
3299 | |
3300 if(i==trailing_ones && i<3) level_code+= 2; //FIXME split first iteration | |
3301 | |
3302 mask= -(level_code&1); | |
3303 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
3304 | |
3305 if(suffix_length==0) suffix_length=1; //FIXME split first iteration | |
3306 | |
3307 #if 1 | |
3308 if(ABS(level[i]) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++; | |
3309 #else | |
3310 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
|
3311 /* ? == prefix > 2 or sth */ |
1168 | 3312 #endif |
1170 | 3313 tprintf("level: %d suffix_length:%d\n", level[i], suffix_length); |
1168 | 3314 } |
3315 | |
3316 if(total_coeff == max_coeff) | |
3317 zeros_left=0; | |
3318 else{ | |
3319 if(n == CHROMA_DC_BLOCK_INDEX) | |
3320 zeros_left= get_vlc2(gb, chroma_dc_total_zeros_vlc[ total_coeff-1 ].table, CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 1); | |
3321 else | |
3322 zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1); | |
3323 } | |
3324 | |
3325 for(i=0; i<total_coeff-1; i++){ | |
3326 if(zeros_left <=0) | |
3327 break; | |
3328 else if(zeros_left < 7){ | |
3329 run[i]= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
3330 }else{ | |
3331 run[i]= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
3332 } | |
3333 zeros_left -= run[i]; | |
3334 } | |
3335 | |
3336 if(zeros_left<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3337 av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y); |
1168 | 3338 return -1; |
3339 } | |
3340 | |
3341 for(; i<total_coeff-1; i++){ | |
3342 run[i]= 0; | |
3343 } | |
3344 | |
3345 run[i]= zeros_left; | |
3346 | |
3347 coeff_num=-1; | |
3348 if(n > 24){ | |
3349 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
3350 int j; | |
3351 | |
3352 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
3353 j= scantable[ coeff_num ]; | |
3354 | |
3355 block[j]= level[i]; | |
3356 } | |
3357 }else{ | |
3358 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
3359 int j; | |
3360 | |
3361 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
3362 j= scantable[ coeff_num ]; | |
3363 | |
3364 block[j]= level[i] * qmul[j]; | |
3365 // printf("%d %d ", block[j], qmul[j]); | |
3366 } | |
3367 } | |
3368 return 0; | |
3369 } | |
3370 | |
3371 /** | |
3372 * decodes a macroblock | |
3373 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed | |
3374 */ | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3375 static int decode_mb_cavlc(H264Context *h){ |
1168 | 3376 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
|
3377 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1169 | 3378 int mb_type, partition_count, cbp; |
1168 | 3379 |
1252 | 3380 s->dsp.clear_blocks(h->mb); //FIXME avoid if allready clear (move after skip handlong? |
1168 | 3381 |
1170 | 3382 tprintf("pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
1453 | 3383 cbp = 0; /* avoid warning. FIXME: find a solution without slowing |
3384 down the code */ | |
1168 | 3385 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){ |
3386 if(s->mb_skip_run==-1) | |
3387 s->mb_skip_run= get_ue_golomb(&s->gb); | |
3388 | |
3389 if (s->mb_skip_run--) { | |
1187 | 3390 int mx, my; |
1168 | 3391 /* skip mb */ |
3392 //FIXME b frame | |
3393 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0; | |
3394 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3395 memset(h->non_zero_count[mb_xy], 0, 16); |
1168 | 3396 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui |
3397 | |
3398 if(h->sps.mb_aff && s->mb_skip_run==0 && (s->mb_y&1)==0){ | |
3399 h->mb_field_decoding_flag= get_bits1(&s->gb); | |
3400 } | |
3401 | |
3402 if(h->mb_field_decoding_flag) | |
3403 mb_type|= MB_TYPE_INTERLACED; | |
3404 | |
3405 fill_caches(h, mb_type); //FIXME check what is needed and what not ... | |
3406 pred_pskip_motion(h, &mx, &my); | |
3407 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
1269 | 3408 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); |
1168 | 3409 write_back_motion(h, mb_type); |
3410 | |
3411 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
|
3412 s->current_picture.qscale_table[mb_xy]= s->qscale; |
1168 | 3413 h->slice_table[ mb_xy ]= h->slice_num; |
3414 | |
3415 h->prev_mb_skiped= 1; | |
3416 return 0; | |
3417 } | |
3418 } | |
3419 if(h->sps.mb_aff /* && !field pic FIXME needed? */){ | |
3420 if((s->mb_y&1)==0) | |
3421 h->mb_field_decoding_flag = get_bits1(&s->gb); | |
3422 }else | |
3423 h->mb_field_decoding_flag=0; //FIXME som ed note ?! | |
3424 | |
3425 h->prev_mb_skiped= 0; | |
3426 | |
3427 mb_type= get_ue_golomb(&s->gb); | |
3428 if(h->slice_type == B_TYPE){ | |
3429 if(mb_type < 23){ | |
3430 partition_count= b_mb_type_info[mb_type].partition_count; | |
3431 mb_type= b_mb_type_info[mb_type].type; | |
3432 }else{ | |
3433 mb_type -= 23; | |
3434 goto decode_intra_mb; | |
3435 } | |
3436 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){ | |
3437 if(mb_type < 5){ | |
3438 partition_count= p_mb_type_info[mb_type].partition_count; | |
3439 mb_type= p_mb_type_info[mb_type].type; | |
3440 }else{ | |
3441 mb_type -= 5; | |
3442 goto decode_intra_mb; | |
3443 } | |
3444 }else{ | |
3445 assert(h->slice_type == I_TYPE); | |
3446 decode_intra_mb: | |
3447 if(mb_type > 25){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3448 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 | 3449 return -1; |
3450 } | |
3451 partition_count=0; | |
3452 cbp= i_mb_type_info[mb_type].cbp; | |
3453 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; | |
3454 mb_type= i_mb_type_info[mb_type].type; | |
3455 } | |
3456 | |
3457 if(h->mb_field_decoding_flag) | |
3458 mb_type |= MB_TYPE_INTERLACED; | |
3459 | |
3460 s->current_picture.mb_type[mb_xy]= mb_type; | |
3461 h->slice_table[ mb_xy ]= h->slice_num; | |
3462 | |
3463 if(IS_INTRA_PCM(mb_type)){ | |
3464 const uint8_t *ptr; | |
1187 | 3465 int x, y; |
1168 | 3466 |
3467 // we assume these blocks are very rare so we dont optimize it | |
3468 align_get_bits(&s->gb); | |
3469 | |
3470 ptr= s->gb.buffer + get_bits_count(&s->gb); | |
3471 | |
3472 for(y=0; y<16; y++){ | |
3473 const int index= 4*(y&3) + 64*(y>>2); | |
3474 for(x=0; x<16; x++){ | |
3475 h->mb[index + (x&3) + 16*(x>>2)]= *(ptr++); | |
3476 } | |
3477 } | |
3478 for(y=0; y<8; y++){ | |
3479 const int index= 256 + 4*(y&3) + 32*(y>>2); | |
3480 for(x=0; x<8; x++){ | |
3481 h->mb[index + (x&3) + 16*(x>>2)]= *(ptr++); | |
3482 } | |
3483 } | |
3484 for(y=0; y<8; y++){ | |
3485 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); | |
3486 for(x=0; x<8; x++){ | |
3487 h->mb[index + (x&3) + 16*(x>>2)]= *(ptr++); | |
3488 } | |
3489 } | |
3490 | |
3491 skip_bits(&s->gb, 384); //FIXME check /fix the bitstream readers | |
3492 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3493 //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
|
3494 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
|
3495 s->current_picture.qscale_table[mb_xy]= s->qscale; |
1168 | 3496 |
3497 return 0; | |
3498 } | |
3499 | |
3500 fill_caches(h, mb_type); | |
3501 | |
3502 //mb_pred | |
3503 if(IS_INTRA(mb_type)){ | |
3504 // init_top_left_availability(h); | |
3505 if(IS_INTRA4x4(mb_type)){ | |
3506 int i; | |
3507 | |
3508 // fill_intra4x4_pred_table(h); | |
3509 for(i=0; i<16; i++){ | |
3510 const int mode_coded= !get_bits1(&s->gb); | |
3511 const int predicted_mode= pred_intra_mode(h, i); | |
3512 int mode; | |
3513 | |
3514 if(mode_coded){ | |
3515 const int rem_mode= get_bits(&s->gb, 3); | |
3516 if(rem_mode<predicted_mode) | |
3517 mode= rem_mode; | |
3518 else | |
3519 mode= rem_mode + 1; | |
3520 }else{ | |
3521 mode= predicted_mode; | |
3522 } | |
3523 | |
3524 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode; | |
3525 } | |
3526 write_back_intra_pred_mode(h); | |
3527 if( check_intra4x4_pred_mode(h) < 0) | |
3528 return -1; | |
3529 }else{ | |
3530 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode); | |
3531 if(h->intra16x16_pred_mode < 0) | |
3532 return -1; | |
3533 } | |
3534 h->chroma_pred_mode= get_ue_golomb(&s->gb); | |
3535 | |
3536 h->chroma_pred_mode= check_intra_pred_mode(h, h->chroma_pred_mode); | |
3537 if(h->chroma_pred_mode < 0) | |
3538 return -1; | |
3539 }else if(partition_count==4){ | |
3540 int i, j, sub_partition_count[4], list, ref[2][4]; | |
3541 | |
3542 if(h->slice_type == B_TYPE){ | |
3543 for(i=0; i<4; i++){ | |
3544 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
3545 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
|
3546 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 | 3547 return -1; |
3548 } | |
3549 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
3550 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
3551 } | |
3552 }else{ | |
3553 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ? | |
3554 for(i=0; i<4; i++){ | |
3555 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
3556 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
|
3557 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 | 3558 return -1; |
3559 } | |
3560 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
3561 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
3562 } | |
3563 } | |
3564 | |
3565 for(list=0; list<2; list++){ | |
3566 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; | |
3567 if(ref_count == 0) continue; | |
3568 for(i=0; i<4; i++){ | |
3569 if(IS_DIR(h->sub_mb_type[i], 0, list) && !IS_DIRECT(h->sub_mb_type[i])){ | |
3570 ref[list][i] = get_te0_golomb(&s->gb, ref_count); //FIXME init to 0 before and skip? | |
3571 }else{ | |
3572 //FIXME | |
3573 ref[list][i] = -1; | |
3574 } | |
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 | |
3582 for(i=0; i<4; i++){ | |
3583 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]= | |
3584 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i]; | |
3585 | |
3586 if(IS_DIR(h->sub_mb_type[i], 0, list) && !IS_DIRECT(h->sub_mb_type[i])){ | |
3587 const int sub_mb_type= h->sub_mb_type[i]; | |
3588 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1; | |
3589 for(j=0; j<sub_partition_count[i]; j++){ | |
3590 int mx, my; | |
3591 const int index= 4*i + block_width*j; | |
3592 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ]; | |
3593 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my); | |
3594 mx += get_se_golomb(&s->gb); | |
3595 my += get_se_golomb(&s->gb); | |
1170 | 3596 tprintf("final mv:%d %d\n", mx, my); |
3597 | |
1168 | 3598 if(IS_SUB_8X8(sub_mb_type)){ |
3599 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= | |
3600 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; | |
3601 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= | |
3602 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my; | |
3603 }else if(IS_SUB_8X4(sub_mb_type)){ | |
3604 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx; | |
3605 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my; | |
3606 }else if(IS_SUB_4X8(sub_mb_type)){ | |
3607 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx; | |
3608 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my; | |
3609 }else{ | |
3610 assert(IS_SUB_4X4(sub_mb_type)); | |
3611 mv_cache[ 0 ][0]= mx; | |
3612 mv_cache[ 0 ][1]= my; | |
3613 } | |
3614 } | |
3615 }else{ | |
3616 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0]; | |
3617 p[0] = p[1]= | |
3618 p[8] = p[9]= 0; | |
3619 } | |
3620 } | |
3621 } | |
3622 }else if(!IS_DIRECT(mb_type)){ | |
3623 int list, mx, my, i; | |
3624 //FIXME we should set ref_idx_l? to 0 if we use that later ... | |
3625 if(IS_16X16(mb_type)){ | |
3626 for(list=0; list<2; list++){ | |
2392 | 3627 if(h->ref_count[list]>0){ |
1168 | 3628 if(IS_DIR(mb_type, 0, list)){ |
3629 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
3630 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | |
3631 } | |
3632 } | |
3633 } | |
3634 for(list=0; list<2; list++){ | |
3635 if(IS_DIR(mb_type, 0, list)){ | |
3636 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); | |
3637 mx += get_se_golomb(&s->gb); | |
3638 my += get_se_golomb(&s->gb); | |
1170 | 3639 tprintf("final mv:%d %d\n", mx, my); |
3640 | |
1269 | 3641 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
1168 | 3642 } |
3643 } | |
3644 } | |
3645 else if(IS_16X8(mb_type)){ | |
3646 for(list=0; list<2; list++){ | |
3647 if(h->ref_count[list]>0){ | |
3648 for(i=0; i<2; i++){ | |
3649 if(IS_DIR(mb_type, i, list)){ | |
3650 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
3651 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); | |
3652 } | |
3653 } | |
3654 } | |
3655 } | |
3656 for(list=0; list<2; list++){ | |
3657 for(i=0; i<2; i++){ | |
3658 if(IS_DIR(mb_type, i, list)){ | |
3659 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my); | |
3660 mx += get_se_golomb(&s->gb); | |
3661 my += get_se_golomb(&s->gb); | |
1170 | 3662 tprintf("final mv:%d %d\n", mx, my); |
3663 | |
1269 | 3664 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
1168 | 3665 } |
3666 } | |
3667 } | |
3668 }else{ | |
3669 assert(IS_8X16(mb_type)); | |
3670 for(list=0; list<2; list++){ | |
3671 if(h->ref_count[list]>0){ | |
3672 for(i=0; i<2; i++){ | |
3673 if(IS_DIR(mb_type, i, list)){ //FIXME optimize | |
3674 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
3675 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); | |
3676 } | |
3677 } | |
3678 } | |
3679 } | |
3680 for(list=0; list<2; list++){ | |
3681 for(i=0; i<2; i++){ | |
3682 if(IS_DIR(mb_type, i, list)){ | |
3683 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my); | |
3684 mx += get_se_golomb(&s->gb); | |
3685 my += get_se_golomb(&s->gb); | |
1170 | 3686 tprintf("final mv:%d %d\n", mx, my); |
3687 | |
1269 | 3688 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
1168 | 3689 } |
3690 } | |
3691 } | |
3692 } | |
3693 } | |
3694 | |
3695 if(IS_INTER(mb_type)) | |
3696 write_back_motion(h, mb_type); | |
3697 | |
3698 if(!IS_INTRA16x16(mb_type)){ | |
3699 cbp= get_ue_golomb(&s->gb); | |
3700 if(cbp > 47){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3701 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%d) at %d %d\n", cbp, s->mb_x, s->mb_y); |
1168 | 3702 return -1; |
3703 } | |
3704 | |
3705 if(IS_INTRA4x4(mb_type)) | |
3706 cbp= golomb_to_intra4x4_cbp[cbp]; | |
3707 else | |
3708 cbp= golomb_to_inter_cbp[cbp]; | |
3709 } | |
3710 | |
3711 if(cbp || IS_INTRA16x16(mb_type)){ | |
3712 int i8x8, i4x4, chroma_idx; | |
3713 int chroma_qp, dquant; | |
3714 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr; | |
3715 const uint8_t *scan, *dc_scan; | |
3716 | |
3717 // fill_non_zero_count_cache(h); | |
3718 | |
3719 if(IS_INTERLACED(mb_type)){ | |
3720 scan= field_scan; | |
3721 dc_scan= luma_dc_field_scan; | |
3722 }else{ | |
3723 scan= zigzag_scan; | |
3724 dc_scan= luma_dc_zigzag_scan; | |
3725 } | |
3726 | |
3727 dquant= get_se_golomb(&s->gb); | |
3728 | |
3729 if( dquant > 25 || dquant < -26 ){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3730 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 | 3731 return -1; |
3732 } | |
3733 | |
3734 s->qscale += dquant; | |
3735 if(((unsigned)s->qscale) > 51){ | |
3736 if(s->qscale<0) s->qscale+= 52; | |
3737 else s->qscale-= 52; | |
3738 } | |
3739 | |
3740 h->chroma_qp= chroma_qp= get_chroma_qp(h, s->qscale); | |
3741 if(IS_INTRA16x16(mb_type)){ | |
3742 if( decode_residual(h, h->intra_gb_ptr, h->mb, LUMA_DC_BLOCK_INDEX, dc_scan, s->qscale, 16) < 0){ | |
3743 return -1; //FIXME continue if partotioned and other retirn -1 too | |
3744 } | |
3745 | |
3746 assert((cbp&15) == 0 || (cbp&15) == 15); | |
3747 | |
3748 if(cbp&15){ | |
3749 for(i8x8=0; i8x8<4; i8x8++){ | |
3750 for(i4x4=0; i4x4<4; i4x4++){ | |
3751 const int index= i4x4 + 4*i8x8; | |
3752 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, s->qscale, 15) < 0 ){ | |
3753 return -1; | |
3754 } | |
3755 } | |
3756 } | |
3757 }else{ | |
1636 | 3758 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1); |
1168 | 3759 } |
3760 }else{ | |
3761 for(i8x8=0; i8x8<4; i8x8++){ | |
3762 if(cbp & (1<<i8x8)){ | |
3763 for(i4x4=0; i4x4<4; i4x4++){ | |
3764 const int index= i4x4 + 4*i8x8; | |
3765 | |
3766 if( decode_residual(h, gb, h->mb + 16*index, index, scan, s->qscale, 16) <0 ){ | |
3767 return -1; | |
3768 } | |
3769 } | |
3770 }else{ | |
3771 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; | |
3772 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; | |
3773 } | |
3774 } | |
3775 } | |
3776 | |
3777 if(cbp&0x30){ | |
3778 for(chroma_idx=0; chroma_idx<2; chroma_idx++) | |
3779 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, chroma_qp, 4) < 0){ | |
3780 return -1; | |
3781 } | |
3782 } | |
3783 | |
3784 if(cbp&0x20){ | |
3785 for(chroma_idx=0; chroma_idx<2; chroma_idx++){ | |
3786 for(i4x4=0; i4x4<4; i4x4++){ | |
3787 const int index= 16 + 4*chroma_idx + i4x4; | |
3788 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, chroma_qp, 15) < 0){ | |
3789 return -1; | |
3790 } | |
3791 } | |
3792 } | |
3793 }else{ | |
3794 uint8_t * const nnz= &h->non_zero_count_cache[0]; | |
3795 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
3796 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
3797 } | |
3798 }else{ | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3799 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
|
3800 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
|
3801 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
|
3802 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; |
1168 | 3803 } |
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
|
3804 s->current_picture.qscale_table[mb_xy]= s->qscale; |
1168 | 3805 write_back_non_zero_count(h); |
3806 | |
3807 return 0; | |
3808 } | |
3809 | |
2312 | 3810 static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_slice) { |
3811 uint8_t *state= &h->cabac_state[ctx_base]; | |
3812 int mb_type; | |
3813 | |
3814 if(intra_slice){ | |
3815 MpegEncContext * const s = &h->s; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3816 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
2312 | 3817 int ctx=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
|
3818 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
|
3819 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3820 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
|
3821 ctx++; |
2312 | 3822 if( get_cabac( &h->cabac, &state[ctx] ) == 0 ) |
3823 return 0; /* I4x4 */ | |
3824 state += 2; | |
3825 }else{ | |
3826 if( get_cabac( &h->cabac, &state[0] ) == 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
|
3827 return 0; /* I4x4 */ |
2312 | 3828 } |
3829 | |
3830 if( get_cabac_terminate( &h->cabac ) ) | |
3831 return 25; /* PCM */ | |
3832 | |
3833 mb_type = 1; /* I16x16 */ | |
3834 if( get_cabac( &h->cabac, &state[1] ) ) | |
3835 mb_type += 12; /* cbp_luma != 0 */ | |
3836 | |
3837 if( get_cabac( &h->cabac, &state[2] ) ) { | |
3838 if( get_cabac( &h->cabac, &state[2+intra_slice] ) ) | |
3839 mb_type += 4 * 2; /* cbp_chroma == 2 */ | |
3840 else | |
3841 mb_type += 4 * 1; /* cbp_chroma == 1 */ | |
3842 } | |
3843 if( get_cabac( &h->cabac, &state[3+intra_slice] ) ) | |
3844 mb_type += 2; | |
3845 if( get_cabac( &h->cabac, &state[3+2*intra_slice] ) ) | |
3846 mb_type += 1; | |
3847 return mb_type; | |
3848 } | |
3849 | |
3850 static int decode_cabac_mb_type( H264Context *h ) { | |
3851 MpegEncContext * const s = &h->s; | |
3852 | |
3853 if( h->slice_type == I_TYPE ) { | |
3854 return decode_cabac_intra_mb_type(h, 3, 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
|
3855 } 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
|
3856 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
|
3857 /* 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
|
3858 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
|
3859 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
|
3860 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
|
3861 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3862 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
|
3863 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3864 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
|
3865 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
|
3866 else |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
3867 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
|
3868 } |
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 { |
2312 | 3870 return decode_cabac_intra_mb_type(h, 17, 0) + 5; |
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 } |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3872 } else if( h->slice_type == B_TYPE ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3873 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3874 int ctx = 0; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3875 int bits; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3876 |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3877 if( s->mb_x > 0 && !IS_SKIP( s->current_picture.mb_type[mb_xy-1] ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3878 && !IS_DIRECT( s->current_picture.mb_type[mb_xy-1] ) ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3879 ctx++; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3880 if( s->mb_y > 0 && !IS_SKIP( s->current_picture.mb_type[mb_xy-s->mb_stride] ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3881 && !IS_DIRECT( s->current_picture.mb_type[mb_xy-s->mb_stride] ) ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3882 ctx++; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3883 |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3884 if( !get_cabac( &h->cabac, &h->cabac_state[27+ctx] ) ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3885 return 0; /* B_Direct_16x16 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3886 |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3887 if( !get_cabac( &h->cabac, &h->cabac_state[27+3] ) ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3888 return 1 + get_cabac( &h->cabac, &h->cabac_state[27+5] ); /* B_L[01]_16x16 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3889 } |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3890 |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3891 bits = get_cabac( &h->cabac, &h->cabac_state[27+4] ) << 3; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3892 bits|= get_cabac( &h->cabac, &h->cabac_state[27+5] ) << 2; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3893 bits|= get_cabac( &h->cabac, &h->cabac_state[27+5] ) << 1; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3894 bits|= get_cabac( &h->cabac, &h->cabac_state[27+5] ); |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3895 if( bits < 8 ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3896 return bits + 3; /* B_Bi_16x16 through B_L1_L0_16x8 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3897 else if( bits == 13 ) { |
2312 | 3898 return decode_cabac_intra_mb_type(h, 32, 0) + 23; |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3899 } else if( bits == 14 ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3900 return 11; /* B_L1_L0_8x16 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3901 else if( bits == 15 ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3902 return 22; /* B_8x8 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3903 |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3904 bits= ( bits<<1 ) | get_cabac( &h->cabac, &h->cabac_state[27+5] ); |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3905 return bits - 4; /* B_L0_Bi_* through B_Bi_Bi_* */ |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3906 } else { |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3907 /* TODO SI/SP frames? */ |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3908 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
|
3909 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3910 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3911 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3912 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
|
3913 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
|
3914 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
|
3915 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
|
3916 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
|
3917 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
|
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 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
|
3920 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3921 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
|
3922 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3923 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3924 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
|
3925 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
|
3926 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
|
3927 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
|
3928 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3929 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3930 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
|
3931 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
|
3932 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3933 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
|
3934 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
|
3935 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3936 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
|
3937 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
|
3938 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
|
3939 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
|
3940 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
|
3941 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
|
3942 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
|
3943 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
|
3944 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3945 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
|
3946 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3947 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3948 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
|
3949 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
|
3950 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
|
3951 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
|
3952 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
|
3953 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3954 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
|
3955 |
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
|
3956 /* 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
|
3957 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
|
3958 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
|
3959 |
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
|
3960 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
|
3961 ctx++; |
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 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
|
3964 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
|
3965 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3966 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
|
3967 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
|
3968 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
|
3969 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
|
3970 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3971 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
|
3972 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3973 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3974 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
|
3975 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
|
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 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
|
3978 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
|
3979 }; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3980 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
|
3981 { 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
|
3982 { 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
|
3983 { 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
|
3984 { 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
|
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 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3987 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
|
3988 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
|
3989 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
|
3990 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3991 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
|
3992 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
|
3993 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3994 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
|
3995 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3996 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
|
3997 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
|
3998 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
|
3999 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
|
4000 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
|
4001 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4002 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
|
4003 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
|
4004 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4005 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
|
4006 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
|
4007 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
|
4008 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
|
4009 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4010 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
|
4011 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
|
4012 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
|
4013 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
|
4014 |
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
|
4015 /* 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
|
4016 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
|
4017 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
|
4018 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
|
4019 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4020 } |
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 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
|
4023 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
|
4024 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
|
4025 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
|
4026 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4027 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4028 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
|
4029 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
|
4030 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
|
4031 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4032 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4033 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
|
4034 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4035 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
|
4036 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
|
4037 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
|
4038 |
2314 | 4039 cbp_a = (h->left_cbp>>4)&0x03; |
4040 cbp_b = (h-> top_cbp>>4)&0x03; | |
1908
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; |
2314 | 4051 return 1 + get_cabac( &h->cabac, &h->cabac_state[77 + ctx] ); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4052 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4053 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
|
4054 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
|
4055 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
|
4056 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
|
4057 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
|
4058 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4059 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
|
4060 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
|
4061 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4062 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
|
4063 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4064 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
|
4065 ctx++; |
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 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
|
4068 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
|
4069 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
|
4070 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4071 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
|
4072 val++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4073 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4074 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4075 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
|
4076 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
|
4077 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4078 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
|
4079 } |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4080 static int decode_cabac_p_mb_sub_type( H264Context *h ) { |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4081 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
|
4082 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
|
4083 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
|
4084 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
|
4085 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
|
4086 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
|
4087 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
|
4088 } |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4089 static int decode_cabac_b_mb_sub_type( H264Context *h ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4090 int type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4091 if( !get_cabac( &h->cabac, &h->cabac_state[36] ) ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4092 return 0; /* B_Direct_8x8 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4093 if( !get_cabac( &h->cabac, &h->cabac_state[37] ) ) |
2311
cdbb2f30e08b
small typo patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
2310
diff
changeset
|
4094 return 1 + get_cabac( &h->cabac, &h->cabac_state[39] ); /* B_L0_8x8, B_L1_8x8 */ |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4095 type = 3; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4096 if( get_cabac( &h->cabac, &h->cabac_state[38] ) ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4097 if( get_cabac( &h->cabac, &h->cabac_state[39] ) ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4098 return 11 + get_cabac( &h->cabac, &h->cabac_state[39] ); /* B_L1_4x4, B_Bi_4x4 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4099 type += 4; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4100 } |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4101 type += 2*get_cabac( &h->cabac, &h->cabac_state[39] ); |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4102 type += get_cabac( &h->cabac, &h->cabac_state[39] ); |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4103 return type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4104 } |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4105 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4106 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
|
4107 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
|
4108 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
|
4109 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
|
4110 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
|
4111 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4112 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
|
4113 ctx++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4114 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
|
4115 ctx += 2; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4116 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4117 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
|
4118 ref++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4119 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
|
4120 ctx = 4; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4121 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4122 ctx = 5; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4123 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4124 return ref; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4125 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4126 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4127 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
|
4128 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
|
4129 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
|
4130 int ctxbase = (l == 0) ? 40 : 47; |
2317 | 4131 int ctx, mvd; |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4132 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4133 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
|
4134 ctx = 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4135 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
|
4136 ctx = 2; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4137 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4138 ctx = 1; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4139 |
2317 | 4140 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx])) |
4141 return 0; | |
4142 | |
4143 mvd= 1; | |
4144 ctx= 3; | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4145 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
|
4146 mvd++; |
2317 | 4147 if( ctx < 6 ) |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4148 ctx++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4149 } |
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 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
|
4152 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
|
4153 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
|
4154 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
|
4155 k++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4156 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4157 while( k-- ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4158 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
|
4159 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
|
4160 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4161 } |
2317 | 4162 if( get_cabac_bypass( &h->cabac ) ) return -mvd; |
4163 else return mvd; | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4164 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4165 |
2316 | 4166 static int inline get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { |
2314 | 4167 int nza, nzb; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4168 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
|
4169 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4170 if( cat == 0 ) { |
2314 | 4171 nza = h->left_cbp&0x100; |
4172 nzb = h-> top_cbp&0x100; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4173 } else if( cat == 1 || cat == 2 ) { |
2314 | 4174 nza = h->non_zero_count_cache[scan8[idx] - 1]; |
4175 nzb = h->non_zero_count_cache[scan8[idx] - 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
|
4176 } else if( cat == 3 ) { |
2314 | 4177 nza = (h->left_cbp>>(6+idx))&0x01; |
4178 nzb = (h-> top_cbp>>(6+idx))&0x01; | |
4179 } else { | |
4180 assert(cat == 4); | |
4181 nza = h->non_zero_count_cache[scan8[16+idx] - 1]; | |
4182 nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; | |
4183 } | |
4184 | |
4185 if( nza > 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
|
4186 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4187 |
2314 | 4188 if( nzb > 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
|
4189 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
|
4190 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4191 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
|
4192 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4193 |
2316 | 4194 static int inline decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, int qp, int max_coeff) { |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4195 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
|
4196 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
|
4197 static const int significant_coeff_flag_offset[5] = { 0, 15, 29, 44, 47 }; |
2313 | 4198 static const int coeff_abs_level_m1_offset[5] = {227+ 0, 227+10, 227+20, 227+30, 227+39 }; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4199 |
2313 | 4200 int index[16]; |
4201 | |
4202 int i, last; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4203 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
|
4204 |
2316 | 4205 int abslevel1 = 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
|
4206 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
|
4207 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4208 /* 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
|
4209 * 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
|
4210 * 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
|
4211 * 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
|
4212 * 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
|
4213 */ |
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 /* 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
|
4216 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
|
4217 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
|
4218 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
|
4219 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
|
4220 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
|
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 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
|
4223 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4224 |
2313 | 4225 for(last= 0; last < max_coeff - 1; last++) { |
4226 if( get_cabac( &h->cabac, &h->cabac_state[105+significant_coeff_flag_offset[cat]+last] )) { | |
4227 index[coeff_count++] = last; | |
4228 if( get_cabac( &h->cabac, &h->cabac_state[166+significant_coeff_flag_offset[cat]+last] ) ) { | |
4229 last= max_coeff; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4230 break; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4231 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4232 } |
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( last == max_coeff -1 ) { |
2313 | 4235 index[coeff_count++] = last; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4236 } |
2316 | 4237 assert(coeff_count > 0); |
4238 | |
4239 if( cat == 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
|
4240 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
|
4241 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
|
4242 h->non_zero_count_cache[scan8[n]] = coeff_count; |
2316 | 4243 else if( cat == 3 ) |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4244 h->cbp_table[mb_xy] |= 0x40 << n; |
2316 | 4245 else { |
4246 assert( cat == 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
|
4247 h->non_zero_count_cache[scan8[16+n]] = coeff_count; |
2316 | 4248 } |
1908
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 for( i = coeff_count - 1; i >= 0; i-- ) { |
2316 | 4251 int ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + coeff_abs_level_m1_offset[cat]; |
4252 int j= scantable[index[i]]; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4253 |
2313 | 4254 if( get_cabac( &h->cabac, &h->cabac_state[ctx] ) == 0 ) { |
2316 | 4255 if( cat == 0 || cat == 3 ) { |
4256 if( get_cabac_bypass( &h->cabac ) ) block[j] = -1; | |
4257 else block[j] = 1; | |
4258 }else{ | |
4259 if( get_cabac_bypass( &h->cabac ) ) block[j] = -qmul[j]; | |
4260 else block[j] = qmul[j]; | |
4261 } | |
2313 | 4262 |
4263 abslevel1++; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4264 } else { |
2313 | 4265 int coeff_abs = 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
|
4266 ctx = 5 + FFMIN( 4, abslevelgt1 ) + coeff_abs_level_m1_offset[cat]; |
2313 | 4267 while( coeff_abs < 15 && get_cabac( &h->cabac, &h->cabac_state[ctx] ) ) { |
4268 coeff_abs++; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4269 } |
2313 | 4270 |
4271 if( coeff_abs >= 15 ) { | |
4272 int j = 0; | |
4273 while( get_cabac_bypass( &h->cabac ) ) { | |
4274 coeff_abs += 1 << j; | |
4275 j++; | |
4276 } | |
4277 | |
4278 while( j-- ) { | |
4279 if( get_cabac_bypass( &h->cabac ) ) | |
4280 coeff_abs += 1 << j ; | |
4281 } | |
4282 } | |
4283 | |
2316 | 4284 if( cat == 0 || cat == 3 ) { |
4285 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs; | |
4286 else block[j] = coeff_abs; | |
4287 }else{ | |
4288 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs * qmul[j]; | |
4289 else block[j] = coeff_abs * qmul[j]; | |
4290 } | |
2313 | 4291 |
4292 abslevelgt1++; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4293 } |
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 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
|
4296 } |
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 /** |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4299 * 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
|
4300 * @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
|
4301 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4302 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
|
4303 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
|
4304 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
|
4305 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
|
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 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
|
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( 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
|
4310 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
|
4311 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
|
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( 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
|
4315 /* 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
|
4316 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
|
4317 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
|
4318 |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4319 //FIXME b frame |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4320 /* 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
|
4321 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
|
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 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
|
4324 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
|
4325 #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
|
4326 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
|
4327 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
|
4328 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4329 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
|
4330 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
|
4331 #endif |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4332 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4333 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
|
4334 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
|
4335 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
|
4336 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
|
4337 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
|
4338 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
|
4339 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4340 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
|
4341 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
|
4342 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
|
4343 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
|
4344 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
|
4345 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
|
4346 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4347 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
|
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 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
|
4350 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4351 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4352 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4353 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
|
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( ( 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
|
4356 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
|
4357 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
|
4358 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4359 |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4360 if( h->slice_type == B_TYPE ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4361 if( mb_type < 23 ){ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4362 partition_count= b_mb_type_info[mb_type].partition_count; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4363 mb_type= b_mb_type_info[mb_type].type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4364 }else{ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4365 mb_type -= 23; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4366 goto decode_intra_mb; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4367 } |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4368 } else if( h->slice_type == P_TYPE ) { |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4369 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
|
4370 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
|
4371 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
|
4372 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4373 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
|
4374 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
|
4375 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4376 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4377 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
|
4378 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
|
4379 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
|
4380 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
|
4381 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
|
4382 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
|
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 #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
|
4385 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
|
4386 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
|
4387 #endif |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4388 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4389 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
|
4390 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
|
4391 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4392 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
|
4393 /* TODO */ |
2314 | 4394 assert(0); |
4395 h->cbp_table[mb_xy] = 0xf +4*2; //FIXME ?! | |
4396 h->cbp_table[mb_xy] |= 0x1C0; | |
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
|
4397 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
|
4398 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
|
4399 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
|
4400 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4401 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4402 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
|
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( 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
|
4405 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
|
4406 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
|
4407 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
|
4408 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
|
4409 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
|
4410 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4411 //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
|
4412 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4413 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
|
4414 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
|
4415 } else { |
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->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
|
4417 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
|
4418 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4419 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
|
4420 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
|
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 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
|
4423 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
|
4424 } 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
|
4425 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
|
4426 |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4427 if( h->slice_type == B_TYPE ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4428 for( i = 0; i < 4; i++ ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4429 h->sub_mb_type[i] = decode_cabac_b_mb_sub_type( h ); |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4430 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4431 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4432 } |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4433 } else { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4434 for( i = 0; i < 4; i++ ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4435 h->sub_mb_type[i] = decode_cabac_p_mb_sub_type( h ); |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4436 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4437 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4438 } |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4439 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4440 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4441 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
|
4442 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
|
4443 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
|
4444 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
|
4445 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
|
4446 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
|
4447 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4448 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
|
4449 } else { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4450 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
|
4451 } |
2110 | 4452 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
|
4453 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
|
4454 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4455 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4456 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4457 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4458 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
|
4459 for(i=0; i<4; i++){ |
2110 | 4460 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
|
4461 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4462 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
|
4463 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
|
4464 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
|
4465 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
|
4466 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
|
4467 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
|
4468 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
|
4469 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
|
4470 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
|
4471 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
|
4472 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4473 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
|
4474 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
|
4475 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
|
4476 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4477 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
|
4478 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
|
4479 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
|
4480 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
|
4481 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
|
4482 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4483 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
|
4484 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
|
4485 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
|
4486 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
|
4487 }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
|
4488 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
|
4489 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
|
4490 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4491 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
|
4492 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
|
4493 }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
|
4494 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
|
4495 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
|
4496 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4497 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
|
4498 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
|
4499 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4500 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
|
4501 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
|
4502 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
|
4503 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4504 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
|
4505 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
|
4506 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4507 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4508 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4509 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
|
4510 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
|
4511 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
|
4512 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
|
4513 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4514 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4515 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4516 } 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
|
4517 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
|
4518 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
|
4519 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
|
4520 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
|
4521 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
|
4522 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
|
4523 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
|
4524 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4525 } |
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 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
|
4528 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
|
4529 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
|
4530 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4531 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
|
4532 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
|
4533 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
|
4534 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4535 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
|
4536 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
|
4537 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4538 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4539 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4540 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
|
4541 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
|
4542 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
|
4543 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
|
4544 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
|
4545 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
|
4546 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
|
4547 } |
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 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4550 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4551 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
|
4552 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
|
4553 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
|
4554 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
|
4555 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
|
4556 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
|
4557 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
|
4558 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4559 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
|
4560 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
|
4561 } |
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 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4564 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4565 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
|
4566 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
|
4567 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
|
4568 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
|
4569 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
|
4570 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
|
4571 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
|
4572 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4573 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4574 } |
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 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
|
4577 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
|
4578 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
|
4579 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
|
4580 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
|
4581 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
|
4582 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4583 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
|
4584 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
|
4585 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
|
4586 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4587 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4588 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4589 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4590 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4591 |
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
|
4592 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
|
4593 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
|
4594 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
|
4595 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4596 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4597 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
|
4598 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
|
4599 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
|
4600 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4601 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4602 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
|
4603 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4604 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
|
4605 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
|
4606 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
|
4607 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4608 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
|
4609 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
|
4610 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
|
4611 }else{ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4612 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
|
4613 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
|
4614 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4615 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4616 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
|
4617 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
|
4618 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
|
4619 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
|
4620 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
|
4621 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4622 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
|
4623 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4624 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
|
4625 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
|
4626 //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
|
4627 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
|
4628 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
|
4629 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
|
4630 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
|
4631 //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
|
4632 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
|
4633 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
|
4634 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4635 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4636 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
|
4637 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4638 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4639 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
|
4640 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
|
4641 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
|
4642 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
|
4643 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
|
4644 //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
|
4645 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
|
4646 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
|
4647 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4648 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4649 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
|
4650 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
|
4651 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4652 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4653 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4654 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4655 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
|
4656 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
|
4657 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
|
4658 //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
|
4659 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
|
4660 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
|
4661 } |
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 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4664 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
|
4665 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
|
4666 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
|
4667 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
|
4668 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
|
4669 //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
|
4670 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
|
4671 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
|
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 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4675 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
|
4676 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
|
4677 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
|
4678 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4679 } else { |
2315 | 4680 uint8_t * const nnz= &h->non_zero_count_cache[0]; |
4681 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1); | |
4682 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
4683 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 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
|
4684 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4685 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4686 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
|
4687 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
|
4688 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4689 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
|
4690 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4691 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4692 |
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
|
4693 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
|
4694 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
|
4695 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
|
4696 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
|
4697 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
|
4698 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4699 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
|
4700 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
|
4701 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
|
4702 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
|
4703 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4704 |
1898 | 4705 if( bS[i] < 4 ) { |
4706 const int tc0 = tc0_table[index_a][bS[i] - 1]; | |
4707 /* 4px edge length */ | |
4708 for( d = 0; d < 4; d++ ) { | |
4709 const int p0 = pix[-1]; | |
4710 const int p1 = pix[-2]; | |
4711 const int p2 = pix[-3]; | |
4712 const int q0 = pix[0]; | |
4713 const int q1 = pix[1]; | |
4714 const int q2 = pix[2]; | |
4715 | |
4716 if( ABS( p0 - q0 ) < alpha && | |
4717 ABS( p1 - p0 ) < beta && | |
4718 ABS( q1 - q0 ) < beta ) { | |
4719 int tc = tc0; | |
4720 int i_delta; | |
4721 | |
4722 if( ABS( p2 - p0 ) < beta ) { | |
4723 pix[-2] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); | |
4724 tc++; | |
4725 } | |
4726 if( ABS( q2 - q0 ) < beta ) { | |
4727 pix[1] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); | |
4728 tc++; | |
4729 } | |
4730 | |
4731 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
4732 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ | |
4733 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
|
4734 } |
1898 | 4735 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
|
4736 } |
1898 | 4737 }else{ |
4738 /* 4px edge length */ | |
4739 for( d = 0; d < 4; d++ ) { | |
4740 const int p0 = pix[-1]; | |
4741 const int p1 = pix[-2]; | |
4742 const int p2 = pix[-3]; | |
4743 | |
4744 const int q0 = pix[0]; | |
4745 const int q1 = pix[1]; | |
4746 const int q2 = pix[2]; | |
4747 | |
4748 if( ABS( p0 - q0 ) < alpha && | |
4749 ABS( p1 - p0 ) < beta && | |
4750 ABS( q1 - q0 ) < beta ) { | |
4751 | |
4752 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
4753 if( ABS( p2 - p0 ) < beta) | |
4754 { | |
4755 const int p3 = pix[-4]; | |
4756 /* p0', p1', p2' */ | |
4757 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
4758 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
4759 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
4760 } else { | |
4761 /* p0' */ | |
4762 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
4763 } | |
4764 if( ABS( q2 - q0 ) < beta) | |
4765 { | |
4766 const int q3 = pix[3]; | |
4767 /* q0', q1', q2' */ | |
4768 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
4769 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
4770 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
4771 } else { | |
4772 /* q0' */ | |
4773 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
4774 } | |
4775 }else{ | |
4776 /* p0', q0' */ | |
4777 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
4778 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
4779 } | |
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
|
4780 } |
1898 | 4781 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
|
4782 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4783 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4784 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4785 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4786 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
|
4787 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
|
4788 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
|
4789 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
|
4790 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
|
4791 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4792 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
|
4793 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
|
4794 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
|
4795 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
|
4796 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4797 |
1898 | 4798 if( bS[i] < 4 ) { |
4799 const int tc = tc0_table[index_a][bS[i] - 1] + 1; | |
4800 /* 2px edge length (because we use same bS than the one for luma) */ | |
4801 for( d = 0; d < 2; d++ ){ | |
4802 const int p0 = pix[-1]; | |
4803 const int p1 = pix[-2]; | |
4804 const int q0 = pix[0]; | |
4805 const int q1 = pix[1]; | |
4806 | |
4807 if( ABS( p0 - q0 ) < alpha && | |
4808 ABS( p1 - p0 ) < beta && | |
4809 ABS( q1 - q0 ) < beta ) { | |
4810 const int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
4811 | |
4812 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ | |
4813 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
4814 } | |
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
|
4815 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
|
4816 } |
1898 | 4817 }else{ |
4818 /* 2px edge length (because we use same bS than the one for luma) */ | |
4819 for( d = 0; d < 2; d++ ){ | |
4820 const int p0 = pix[-1]; | |
4821 const int p1 = pix[-2]; | |
4822 const int q0 = pix[0]; | |
4823 const int q1 = pix[1]; | |
4824 | |
4825 if( ABS( p0 - q0 ) < alpha && | |
4826 ABS( p1 - p0 ) < beta && | |
4827 ABS( q1 - q0 ) < beta ) { | |
4828 | |
4829 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */ | |
4830 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ | |
4831 } | |
4832 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
|
4833 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4834 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4835 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4836 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4837 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4838 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
|
4839 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
|
4840 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
|
4841 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
|
4842 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
|
4843 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
|
4844 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4845 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
|
4846 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
|
4847 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
|
4848 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
|
4849 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4850 |
1898 | 4851 if( bS[i] < 4 ) { |
4852 const int tc0 = tc0_table[index_a][bS[i] - 1]; | |
4853 /* 4px edge length */ | |
4854 for( d = 0; d < 4; d++ ) { | |
4855 const int p0 = pix[-1*pix_next]; | |
4856 const int p1 = pix[-2*pix_next]; | |
4857 const int p2 = pix[-3*pix_next]; | |
4858 const int q0 = pix[0]; | |
4859 const int q1 = pix[1*pix_next]; | |
4860 const int q2 = pix[2*pix_next]; | |
4861 | |
4862 if( ABS( p0 - q0 ) < alpha && | |
4863 ABS( p1 - p0 ) < beta && | |
4864 ABS( q1 - q0 ) < beta ) { | |
4865 | |
4866 int tc = tc0; | |
4867 int i_delta; | |
4868 | |
4869 if( ABS( p2 - p0 ) < beta ) { | |
4870 pix[-2*pix_next] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); | |
4871 tc++; | |
4872 } | |
4873 if( ABS( q2 - q0 ) < beta ) { | |
4874 pix[pix_next] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); | |
4875 tc++; | |
4876 } | |
4877 | |
4878 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
4879 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */ | |
4880 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
|
4881 } |
1898 | 4882 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
|
4883 } |
1898 | 4884 }else{ |
4885 /* 4px edge length */ | |
4886 for( d = 0; d < 4; d++ ) { | |
4887 const int p0 = pix[-1*pix_next]; | |
4888 const int p1 = pix[-2*pix_next]; | |
4889 const int p2 = pix[-3*pix_next]; | |
4890 const int q0 = pix[0]; | |
4891 const int q1 = pix[1*pix_next]; | |
4892 const int q2 = pix[2*pix_next]; | |
4893 | |
4894 if( ABS( p0 - q0 ) < alpha && | |
4895 ABS( p1 - p0 ) < beta && | |
4896 ABS( q1 - q0 ) < beta ) { | |
4897 | |
4898 const int p3 = pix[-4*pix_next]; | |
4899 const int q3 = pix[ 3*pix_next]; | |
4900 | |
4901 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
4902 if( ABS( p2 - p0 ) < beta) { | |
4903 /* p0', p1', p2' */ | |
4904 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
4905 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
4906 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
4907 } else { | |
4908 /* p0' */ | |
4909 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
4910 } | |
4911 if( ABS( q2 - q0 ) < beta) { | |
4912 /* q0', q1', q2' */ | |
4913 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
4914 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
4915 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
4916 } else { | |
4917 /* q0' */ | |
4918 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
4919 } | |
4920 }else{ | |
4921 /* p0', q0' */ | |
4922 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
4923 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
4924 } | |
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
|
4925 } |
1898 | 4926 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
|
4927 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4928 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4929 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4930 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4931 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4932 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
|
4933 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
|
4934 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
|
4935 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
|
4936 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
|
4937 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
|
4938 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4939 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
|
4940 { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4941 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
|
4942 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
|
4943 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
|
4944 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4945 |
1898 | 4946 if( bS[i] < 4 ) { |
4947 int tc = tc0_table[index_a][bS[i] - 1] + 1; | |
4948 /* 2px edge length (see deblocking_filter_edgecv) */ | |
4949 for( d = 0; d < 2; d++ ) { | |
4950 const int p0 = pix[-1*pix_next]; | |
4951 const int p1 = pix[-2*pix_next]; | |
4952 const int q0 = pix[0]; | |
4953 const int q1 = pix[1*pix_next]; | |
4954 | |
4955 if( ABS( p0 - q0 ) < alpha && | |
4956 ABS( p1 - p0 ) < beta && | |
4957 ABS( q1 - q0 ) < beta ) { | |
4958 | |
4959 int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
4960 | |
4961 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */ | |
4962 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
4963 } | |
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
|
4964 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
|
4965 } |
1898 | 4966 }else{ |
4967 /* 2px edge length (see deblocking_filter_edgecv) */ | |
4968 for( d = 0; d < 2; d++ ) { | |
4969 const int p0 = pix[-1*pix_next]; | |
4970 const int p1 = pix[-2*pix_next]; | |
4971 const int q0 = pix[0]; | |
4972 const int q1 = pix[1*pix_next]; | |
4973 | |
4974 if( ABS( p0 - q0 ) < alpha && | |
4975 ABS( p1 - p0 ) < beta && | |
4976 ABS( q1 - q0 ) < beta ) { | |
4977 | |
4978 pix[-pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */ | |
4979 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ | |
4980 } | |
4981 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
|
4982 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4983 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4984 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4985 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4986 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4987 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
|
4988 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
|
4989 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
|
4990 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
|
4991 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
|
4992 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4993 /* 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
|
4994 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
|
4995 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
|
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 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
|
4998 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
|
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 /* 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
|
5001 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
|
5002 { |
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 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
|
5004 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
|
5005 |
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 /* 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
|
5007 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
|
5008 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
|
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 /* 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
|
5011 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
|
5012 } |
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 /* 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
|
5015 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
|
5016 /* 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
|
5017 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
|
5018 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
|
5019 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
|
5020 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5021 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
|
5022 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
|
5023 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
|
5024 } 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
|
5025 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
|
5026 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
|
5027 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
|
5028 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
|
5029 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
|
5030 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
|
5031 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5032 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
|
5033 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
|
5034 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
|
5035 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5036 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
|
5037 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
|
5038 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
|
5039 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
|
5040 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
|
5041 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
|
5042 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
|
5043 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5044 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
|
5045 /* 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
|
5046 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
|
5047 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5048 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5049 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5050 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
|
5051 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
|
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 /* 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
|
5055 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
|
5056 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
|
5057 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp ); |
1898 | 5058 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
|
5059 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
|
5060 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
|
5061 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
|
5062 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
|
5063 } |
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 } 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
|
5065 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp ); |
1898 | 5066 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
|
5067 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
|
5068 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
|
5069 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
|
5070 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
|
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 } |
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 } |
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 } |
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 |
1168 | 5077 static int decode_slice(H264Context *h){ |
5078 MpegEncContext * const s = &h->s; | |
5079 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; | |
5080 | |
5081 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
|
5082 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5083 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
|
5084 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
|
5085 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5086 /* realign */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5087 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
|
5088 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5089 /* 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
|
5090 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
|
5091 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
|
5092 s->gb.buffer + get_bits_count(&s->gb)/8, |
2116 | 5093 ( 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
|
5094 /* 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
|
5095 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
|
5096 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
|
5097 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
|
5098 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
|
5099 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5100 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
|
5101 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5102 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
|
5103 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
|
5104 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5105 h->cabac_state[i] = 2 * ( pre - 64 ) + 1; |
1168 | 5106 } |
5107 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5108 for(;;){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5109 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
|
5110 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
|
5111 |
2163 | 5112 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
|
5113 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5114 /* 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
|
5115 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
|
5116 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
|
5117 |
2163 | 5118 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
|
5119 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
|
5120 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5121 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
|
5122 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
|
5123 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5124 |
2116 | 5125 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
|
5126 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
|
5127 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
|
5128 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
|
5129 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5130 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5131 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
|
5132 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
|
5133 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
2392 | 5134 ++s->mb_y; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5135 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5136 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5137 if( eos || s->mb_y >= s->mb_height ) { |
2392 | 5138 tprintf("slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5139 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
|
5140 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
|
5141 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5142 #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
|
5143 /* 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
|
5144 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
|
5145 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
|
5146 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
|
5147 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5148 #endif |
1168 | 5149 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5150 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5151 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5152 for(;;){ |
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 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
|
5154 |
2163 | 5155 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
|
5156 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5157 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
|
5158 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
|
5159 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
|
5160 |
2163 | 5161 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
|
5162 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
|
5163 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5164 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5165 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
|
5166 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
|
5167 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
|
5168 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5169 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
|
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 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5172 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
|
5173 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
|
5174 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
|
5175 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
|
5176 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
|
5177 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5178 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
|
5179 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
|
5180 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5181 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
|
5182 }else{ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5183 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
|
5184 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5185 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
|
5186 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5187 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5188 } |
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 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){ |
2392 | 5191 tprintf("slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5192 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){ |
1168 | 5193 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); |
5194 | |
5195 return 0; | |
5196 }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
|
5197 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 | 5198 |
5199 return -1; | |
5200 } | |
5201 } | |
5202 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5203 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5204 |
1168 | 5205 #if 0 |
5206 for(;s->mb_y < s->mb_height; s->mb_y++){ | |
5207 for(;s->mb_x < s->mb_width; s->mb_x++){ | |
5208 int ret= decode_mb(h); | |
5209 | |
5210 hl_decode_mb(h); | |
5211 | |
5212 if(ret<0){ | |
5213 fprintf(stderr, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); | |
5214 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); | |
5215 | |
5216 return -1; | |
5217 } | |
5218 | |
5219 if(++s->mb_x >= s->mb_width){ | |
5220 s->mb_x=0; | |
5221 if(++s->mb_y >= s->mb_height){ | |
5222 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
5223 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); | |
5224 | |
5225 return 0; | |
5226 }else{ | |
5227 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); | |
5228 | |
5229 return -1; | |
5230 } | |
5231 } | |
5232 } | |
5233 | |
5234 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){ | |
5235 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
5236 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); | |
5237 | |
5238 return 0; | |
5239 }else{ | |
5240 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); | |
5241 | |
5242 return -1; | |
5243 } | |
5244 } | |
5245 } | |
5246 s->mb_x=0; | |
5247 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
5248 } | |
5249 #endif | |
5250 return -1; //not reached | |
5251 } | |
5252 | |
5253 static inline int decode_vui_parameters(H264Context *h, SPS *sps){ | |
5254 MpegEncContext * const s = &h->s; | |
5255 int aspect_ratio_info_present_flag, aspect_ratio_idc; | |
5256 | |
5257 aspect_ratio_info_present_flag= get_bits1(&s->gb); | |
5258 | |
5259 if( aspect_ratio_info_present_flag ) { | |
5260 aspect_ratio_idc= get_bits(&s->gb, 8); | |
5261 if( aspect_ratio_idc == EXTENDED_SAR ) { | |
1548 | 5262 sps->sar.num= get_bits(&s->gb, 16); |
5263 sps->sar.den= get_bits(&s->gb, 16); | |
1168 | 5264 }else if(aspect_ratio_idc < 16){ |
1548 | 5265 sps->sar= pixel_aspect[aspect_ratio_idc]; |
1168 | 5266 }else{ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5267 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n"); |
1168 | 5268 return -1; |
5269 } | |
5270 }else{ | |
1548 | 5271 sps->sar.num= |
5272 sps->sar.den= 0; | |
1168 | 5273 } |
5274 // 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
|
5275 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5276 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
|
5277 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
|
5278 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5279 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5280 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
|
5281 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
|
5282 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
|
5283 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
|
5284 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
|
5285 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
|
5286 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
|
5287 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5288 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5289 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5290 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
|
5291 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
|
5292 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
|
5293 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5294 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5295 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
|
5296 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
|
5297 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
|
5298 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
|
5299 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
|
5300 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5301 |
1168 | 5302 #if 0 |
5303 | nal_hrd_parameters_present_flag |0 |u(1) | | |
5304 | if( nal_hrd_parameters_present_flag = = 1) | | | | |
5305 | hrd_parameters( ) | | | | |
5306 | vcl_hrd_parameters_present_flag |0 |u(1) | | |
5307 | if( vcl_hrd_parameters_present_flag = = 1) | | | | |
5308 | hrd_parameters( ) | | | | |
5309 | if( ( nal_hrd_parameters_present_flag = = 1 | || | | | |
5310 | | | | | |
5311 |( vcl_hrd_parameters_present_flag = = 1 ) ) | | | | |
5312 | low_delay_hrd_flag |0 |u(1) | | |
5313 | bitstream_restriction_flag |0 |u(1) | | |
5314 | if( bitstream_restriction_flag ) { |0 |u(1) | | |
5315 | motion_vectors_over_pic_boundaries_flag |0 |u(1) | | |
5316 | max_bytes_per_pic_denom |0 |ue(v) | | |
5317 | max_bits_per_mb_denom |0 |ue(v) | | |
5318 | log2_max_mv_length_horizontal |0 |ue(v) | | |
5319 | log2_max_mv_length_vertical |0 |ue(v) | | |
5320 | num_reorder_frames |0 |ue(v) | | |
5321 | max_dec_frame_buffering |0 |ue(v) | | |
5322 | } | | | | |
5323 |} | | | | |
5324 #endif | |
5325 return 0; | |
5326 } | |
5327 | |
5328 static inline int decode_seq_parameter_set(H264Context *h){ | |
5329 MpegEncContext * const s = &h->s; | |
1371 | 5330 int profile_idc, level_idc; |
1168 | 5331 int sps_id, i; |
5332 SPS *sps; | |
5333 | |
5334 profile_idc= get_bits(&s->gb, 8); | |
1371 | 5335 get_bits1(&s->gb); //constraint_set0_flag |
5336 get_bits1(&s->gb); //constraint_set1_flag | |
5337 get_bits1(&s->gb); //constraint_set2_flag | |
2312 | 5338 get_bits1(&s->gb); //constraint_set3_flag |
5339 get_bits(&s->gb, 4); // reserved | |
1168 | 5340 level_idc= get_bits(&s->gb, 8); |
5341 sps_id= get_ue_golomb(&s->gb); | |
5342 | |
5343 sps= &h->sps_buffer[ sps_id ]; | |
5344 sps->profile_idc= profile_idc; | |
5345 sps->level_idc= level_idc; | |
2312 | 5346 |
1168 | 5347 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4; |
5348 sps->poc_type= get_ue_golomb(&s->gb); | |
5349 | |
5350 if(sps->poc_type == 0){ //FIXME #define | |
5351 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4; | |
5352 } else if(sps->poc_type == 1){//FIXME #define | |
5353 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb); | |
5354 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb); | |
5355 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb); | |
5356 sps->poc_cycle_length= get_ue_golomb(&s->gb); | |
5357 | |
5358 for(i=0; i<sps->poc_cycle_length; i++) | |
5359 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb); | |
5360 } | |
5361 if(sps->poc_type > 2){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5362 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type); |
1168 | 5363 return -1; |
5364 } | |
5365 | |
5366 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
|
5367 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
|
5368 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
|
5369 } |
1371 | 5370 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb); |
1168 | 5371 sps->mb_width= get_ue_golomb(&s->gb) + 1; |
5372 sps->mb_height= get_ue_golomb(&s->gb) + 1; | |
5373 sps->frame_mbs_only_flag= get_bits1(&s->gb); | |
5374 if(!sps->frame_mbs_only_flag) | |
5375 sps->mb_aff= get_bits1(&s->gb); | |
5376 else | |
5377 sps->mb_aff= 0; | |
5378 | |
5379 sps->direct_8x8_inference_flag= get_bits1(&s->gb); | |
5380 | |
1371 | 5381 sps->crop= get_bits1(&s->gb); |
5382 if(sps->crop){ | |
5383 sps->crop_left = get_ue_golomb(&s->gb); | |
5384 sps->crop_right = get_ue_golomb(&s->gb); | |
5385 sps->crop_top = get_ue_golomb(&s->gb); | |
5386 sps->crop_bottom= get_ue_golomb(&s->gb); | |
5387 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
|
5388 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completly supported, this could look slightly wrong ...\n"); |
1371 | 5389 } |
5390 }else{ | |
5391 sps->crop_left = | |
5392 sps->crop_right = | |
5393 sps->crop_top = | |
5394 sps->crop_bottom= 0; | |
5395 } | |
5396 | |
1168 | 5397 sps->vui_parameters_present_flag= get_bits1(&s->gb); |
5398 if( sps->vui_parameters_present_flag ) | |
5399 decode_vui_parameters(h, sps); | |
5400 | |
5401 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
|
5402 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 | 5403 sps_id, sps->profile_idc, sps->level_idc, |
5404 sps->poc_type, | |
5405 sps->ref_frame_count, | |
5406 sps->mb_width, sps->mb_height, | |
5407 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"), | |
5408 sps->direct_8x8_inference_flag ? "8B8" : "", | |
1371 | 5409 sps->crop_left, sps->crop_right, |
5410 sps->crop_top, sps->crop_bottom, | |
1168 | 5411 sps->vui_parameters_present_flag ? "VUI" : "" |
5412 ); | |
5413 } | |
5414 return 0; | |
5415 } | |
5416 | |
5417 static inline int decode_picture_parameter_set(H264Context *h){ | |
5418 MpegEncContext * const s = &h->s; | |
5419 int pps_id= get_ue_golomb(&s->gb); | |
5420 PPS *pps= &h->pps_buffer[pps_id]; | |
5421 | |
5422 pps->sps_id= get_ue_golomb(&s->gb); | |
5423 pps->cabac= get_bits1(&s->gb); | |
5424 pps->pic_order_present= get_bits1(&s->gb); | |
5425 pps->slice_group_count= get_ue_golomb(&s->gb) + 1; | |
5426 if(pps->slice_group_count > 1 ){ | |
5427 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
|
5428 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n"); |
1168 | 5429 switch(pps->mb_slice_group_map_type){ |
5430 case 0: | |
5431 #if 0 | |
5432 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | | | |
5433 | run_length[ i ] |1 |ue(v) | | |
5434 #endif | |
5435 break; | |
5436 case 2: | |
5437 #if 0 | |
5438 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | | | |
5439 |{ | | | | |
5440 | top_left_mb[ i ] |1 |ue(v) | | |
5441 | bottom_right_mb[ i ] |1 |ue(v) | | |
5442 | } | | | | |
5443 #endif | |
5444 break; | |
5445 case 3: | |
5446 case 4: | |
5447 case 5: | |
5448 #if 0 | |
5449 | slice_group_change_direction_flag |1 |u(1) | | |
5450 | slice_group_change_rate_minus1 |1 |ue(v) | | |
5451 #endif | |
5452 break; | |
5453 case 6: | |
5454 #if 0 | |
5455 | slice_group_id_cnt_minus1 |1 |ue(v) | | |
5456 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | | | |
5457 |) | | | | |
5458 | slice_group_id[ i ] |1 |u(v) | | |
5459 #endif | |
1214 | 5460 break; |
1168 | 5461 } |
5462 } | |
5463 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
5464 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
5465 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
|
5466 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n"); |
1168 | 5467 return -1; |
5468 } | |
5469 | |
5470 pps->weighted_pred= get_bits1(&s->gb); | |
5471 pps->weighted_bipred_idc= get_bits(&s->gb, 2); | |
5472 pps->init_qp= get_se_golomb(&s->gb) + 26; | |
5473 pps->init_qs= get_se_golomb(&s->gb) + 26; | |
5474 pps->chroma_qp_index_offset= get_se_golomb(&s->gb); | |
5475 pps->deblocking_filter_parameters_present= get_bits1(&s->gb); | |
5476 pps->constrained_intra_pred= get_bits1(&s->gb); | |
5477 pps->redundant_pic_cnt_present = get_bits1(&s->gb); | |
5478 | |
5479 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
|
5480 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 | 5481 pps_id, pps->sps_id, |
5482 pps->cabac ? "CABAC" : "CAVLC", | |
5483 pps->slice_group_count, | |
5484 pps->ref_count[0], pps->ref_count[1], | |
5485 pps->weighted_pred ? "weighted" : "", | |
5486 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset, | |
5487 pps->deblocking_filter_parameters_present ? "LPAR" : "", | |
5488 pps->constrained_intra_pred ? "CONSTR" : "", | |
1371 | 5489 pps->redundant_pic_cnt_present ? "REDU" : "" |
1168 | 5490 ); |
5491 } | |
5492 | |
5493 return 0; | |
5494 } | |
5495 | |
5496 /** | |
5497 * finds the end of the current frame in the bitstream. | |
5498 * @return the position of the first byte of the next frame, or -1 | |
5499 */ | |
2392 | 5500 static int find_frame_end(H264Context *h, const uint8_t *buf, int buf_size){ |
1187 | 5501 int i; |
1168 | 5502 uint32_t state; |
2392 | 5503 ParseContext *pc = &(h->s.parse_context); |
1168 | 5504 //printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]); |
5505 // mb_addr= pc->mb_addr - 1; | |
5506 state= pc->state; | |
2392 | 5507 for(i=0; i<=buf_size; i++){ |
1168 | 5508 if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){ |
2392 | 5509 tprintf("find_frame_end new startcode = %08x, frame_start_found = %d, pos = %d\n", state, pc->frame_start_found, i); |
1168 | 5510 if(pc->frame_start_found){ |
2392 | 5511 // If there isn't one more byte in the buffer |
5512 // the test on first_mb_in_slice cannot be done yet | |
5513 // do it at next call. | |
5514 if (i >= buf_size) break; | |
5515 if (buf[i] & 0x80) { | |
5516 // first_mb_in_slice is 0, probably the first nal of a new | |
5517 // slice | |
5518 tprintf("find_frame_end frame_end_found, state = %08x, pos = %d\n", state, i); | |
5519 pc->state=-1; | |
5520 pc->frame_start_found= 0; | |
5521 return i-4; | |
5522 } | |
1168 | 5523 } |
2392 | 5524 pc->frame_start_found = 1; |
1168 | 5525 } |
2392 | 5526 if (i<buf_size) |
5527 state= (state<<8) | buf[i]; | |
1168 | 5528 } |
5529 | |
5530 pc->state= state; | |
1219 | 5531 return END_NOT_FOUND; |
1168 | 5532 } |
5533 | |
1988 | 5534 static int h264_parse(AVCodecParserContext *s, |
5535 AVCodecContext *avctx, | |
5536 uint8_t **poutbuf, int *poutbuf_size, | |
5537 const uint8_t *buf, int buf_size) | |
5538 { | |
2392 | 5539 H264Context *h = s->priv_data; |
5540 ParseContext *pc = &h->s.parse_context; | |
1988 | 5541 int next; |
5542 | |
2392 | 5543 next= find_frame_end(h, buf, buf_size); |
1988 | 5544 |
5545 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { | |
5546 *poutbuf = NULL; | |
5547 *poutbuf_size = 0; | |
5548 return buf_size; | |
5549 } | |
5550 | |
5551 *poutbuf = (uint8_t *)buf; | |
5552 *poutbuf_size = buf_size; | |
5553 return next; | |
5554 } | |
5555 | |
1168 | 5556 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ |
5557 MpegEncContext * const s = &h->s; | |
5558 AVCodecContext * const avctx= s->avctx; | |
5559 int buf_index=0; | |
1322 | 5560 #if 0 |
1168 | 5561 int i; |
5562 for(i=0; i<32; i++){ | |
5563 printf("%X ", buf[i]); | |
5564 } | |
5565 #endif | |
2392 | 5566 h->slice_num = 0; |
1168 | 5567 for(;;){ |
5568 int consumed; | |
5569 int dst_length; | |
5570 int bit_length; | |
5571 uint8_t *ptr; | |
2227 | 5572 int i, nalsize = 0; |
1168 | 5573 |
2227 | 5574 if(h->is_avc) { |
5575 if(buf_index >= buf_size) break; | |
5576 nalsize = 0; | |
5577 for(i = 0; i < h->nal_length_size; i++) | |
5578 nalsize = (nalsize << 8) | buf[buf_index++]; | |
5579 } else { | |
1168 | 5580 // start code prefix search |
5581 for(; buf_index + 3 < buf_size; buf_index++){ | |
5582 // this should allways succeed in the first iteration | |
5583 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | |
5584 break; | |
5585 } | |
5586 | |
5587 if(buf_index+3 >= buf_size) break; | |
5588 | |
5589 buf_index+=3; | |
2227 | 5590 } |
1168 | 5591 |
5592 ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, buf_size - buf_index); | |
5593 if(ptr[dst_length - 1] == 0) dst_length--; | |
5594 bit_length= 8*dst_length - decode_rbsp_trailing(ptr + dst_length - 1); | |
5595 | |
5596 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
|
5597 av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d length %d\n", h->nal_unit_type, buf_index, dst_length); |
1168 | 5598 } |
5599 | |
2227 | 5600 if (h->is_avc && (nalsize != consumed)) |
5601 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); | |
5602 | |
1168 | 5603 buf_index += consumed; |
5604 | |
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
|
5605 if( s->hurry_up == 1 && h->nal_ref_idc == 0 ) |
1168 | 5606 continue; |
5607 | |
5608 switch(h->nal_unit_type){ | |
5609 case NAL_IDR_SLICE: | |
5610 idr(h); //FIXME ensure we dont loose some frames if there is reordering | |
5611 case NAL_SLICE: | |
5612 init_get_bits(&s->gb, ptr, bit_length); | |
5613 h->intra_gb_ptr= | |
5614 h->inter_gb_ptr= &s->gb; | |
5615 s->data_partitioning = 0; | |
5616 | |
5617 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
|
5618 if(h->redundant_pic_count==0 && s->hurry_up < 5 ) |
1168 | 5619 decode_slice(h); |
5620 break; | |
5621 case NAL_DPA: | |
5622 init_get_bits(&s->gb, ptr, bit_length); | |
5623 h->intra_gb_ptr= | |
5624 h->inter_gb_ptr= NULL; | |
5625 s->data_partitioning = 1; | |
5626 | |
5627 if(decode_slice_header(h) < 0) return -1; | |
5628 break; | |
5629 case NAL_DPB: | |
5630 init_get_bits(&h->intra_gb, ptr, bit_length); | |
5631 h->intra_gb_ptr= &h->intra_gb; | |
5632 break; | |
5633 case NAL_DPC: | |
5634 init_get_bits(&h->inter_gb, ptr, bit_length); | |
5635 h->inter_gb_ptr= &h->inter_gb; | |
1174 | 5636 |
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
|
5637 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning && s->hurry_up < 5 ) |
1168 | 5638 decode_slice(h); |
5639 break; | |
5640 case NAL_SEI: | |
5641 break; | |
5642 case NAL_SPS: | |
5643 init_get_bits(&s->gb, ptr, bit_length); | |
5644 decode_seq_parameter_set(h); | |
5645 | |
5646 if(s->flags& CODEC_FLAG_LOW_DELAY) | |
5647 s->low_delay=1; | |
5648 | |
5649 avctx->has_b_frames= !s->low_delay; | |
5650 break; | |
5651 case NAL_PPS: | |
5652 init_get_bits(&s->gb, ptr, bit_length); | |
5653 | |
5654 decode_picture_parameter_set(h); | |
5655 | |
5656 break; | |
5657 case NAL_PICTURE_DELIMITER: | |
5658 break; | |
5659 case NAL_FILTER_DATA: | |
5660 break; | |
2099 | 5661 default: |
5662 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type); | |
1168 | 5663 } |
5664 | |
5665 //FIXME move after where irt is set | |
5666 s->current_picture.pict_type= s->pict_type; | |
5667 s->current_picture.key_frame= s->pict_type == I_TYPE; | |
5668 } | |
5669 | |
1174 | 5670 if(!s->current_picture_ptr) return buf_index; //no frame |
5671 | |
1168 | 5672 h->prev_frame_num_offset= h->frame_num_offset; |
5673 h->prev_frame_num= h->frame_num; | |
5674 if(s->current_picture_ptr->reference){ | |
5675 h->prev_poc_msb= h->poc_msb; | |
5676 h->prev_poc_lsb= h->poc_lsb; | |
5677 } | |
5678 if(s->current_picture_ptr->reference) | |
5679 execute_ref_pic_marking(h, h->mmco, h->mmco_index); | |
5680 else | |
1169 | 5681 assert(h->mmco_index==0); |
1168 | 5682 |
5683 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
|
5684 |
1168 | 5685 MPV_frame_end(s); |
5686 | |
5687 return buf_index; | |
5688 } | |
5689 | |
5690 /** | |
5691 * retunrs the number of bytes consumed for building the current frame | |
5692 */ | |
5693 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){ | |
5694 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
5695 pos -= s->parse_context.last_index; | |
5696 if(pos<0) pos=0; // FIXME remove (uneeded?) | |
5697 | |
5698 return pos; | |
5699 }else{ | |
5700 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...) | |
5701 if(pos+10>buf_size) pos=buf_size; // oops ;) | |
5702 | |
5703 return pos; | |
5704 } | |
5705 } | |
5706 | |
5707 static int decode_frame(AVCodecContext *avctx, | |
5708 void *data, int *data_size, | |
5709 uint8_t *buf, int buf_size) | |
5710 { | |
5711 H264Context *h = avctx->priv_data; | |
5712 MpegEncContext *s = &h->s; | |
5713 AVFrame *pict = data; | |
5714 int buf_index; | |
5715 | |
5716 s->flags= avctx->flags; | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1706
diff
changeset
|
5717 s->flags2= avctx->flags2; |
1168 | 5718 |
5719 /* no supplementary picture */ | |
5720 if (buf_size == 0) { | |
5721 return 0; | |
5722 } | |
5723 | |
5724 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
2392 | 5725 int next= find_frame_end(h, buf, buf_size); |
1168 | 5726 |
1988 | 5727 if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 ) |
1168 | 5728 return buf_size; |
5729 //printf("next:%d buf_size:%d last_index:%d\n", next, buf_size, s->parse_context.last_index); | |
5730 } | |
5731 | |
2227 | 5732 if(h->is_avc && !h->got_avcC) { |
5733 int i, cnt, nalsize; | |
5734 unsigned char *p = avctx->extradata; | |
5735 if(avctx->extradata_size < 7) { | |
5736 av_log(avctx, AV_LOG_ERROR, "avcC too short\n"); | |
5737 return -1; | |
5738 } | |
5739 if(*p != 1) { | |
5740 av_log(avctx, AV_LOG_ERROR, "Unknown avcC version %d\n", *p); | |
5741 return -1; | |
5742 } | |
5743 /* sps and pps in the avcC always have length coded with 2 bytes, | |
5744 so put a fake nal_length_size = 2 while parsing them */ | |
5745 h->nal_length_size = 2; | |
5746 // Decode sps from avcC | |
5747 cnt = *(p+5) & 0x1f; // Number of sps | |
5748 p += 6; | |
5749 for (i = 0; i < cnt; i++) { | |
5750 nalsize = BE_16(p) + 2; | |
5751 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
5752 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); | |
5753 return -1; | |
5754 } | |
5755 p += nalsize; | |
5756 } | |
5757 // Decode pps from avcC | |
5758 cnt = *(p++); // Number of pps | |
5759 for (i = 0; i < cnt; i++) { | |
5760 nalsize = BE_16(p) + 2; | |
5761 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
5762 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); | |
5763 return -1; | |
5764 } | |
5765 p += nalsize; | |
5766 } | |
5767 // Now store right nal length size, that will be use to parse all other nals | |
5768 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1; | |
5769 // Do not reparse avcC | |
5770 h->got_avcC = 1; | |
5771 } | |
5772 | |
5773 if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){ | |
1168 | 5774 if(0 < decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) ) |
5775 return -1; | |
5776 } | |
5777 | |
5778 buf_index=decode_nal_units(h, buf, buf_size); | |
5779 if(buf_index < 0) | |
5780 return -1; | |
5781 | |
5782 //FIXME do something with unavailable reference frames | |
5783 | |
5784 // if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_index, buf_size); | |
5785 #if 0 | |
5786 if(s->pict_type==B_TYPE || s->low_delay){ | |
5787 *pict= *(AVFrame*)&s->current_picture; | |
5788 } else { | |
5789 *pict= *(AVFrame*)&s->last_picture; | |
5790 } | |
5791 #endif | |
1174 | 5792 if(!s->current_picture_ptr){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5793 av_log(h->s.avctx, AV_LOG_DEBUG, "error, NO frame\n"); |
1174 | 5794 return -1; |
5795 } | |
5796 | |
1168 | 5797 *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
|
5798 ff_print_debug_info(s, pict); |
1168 | 5799 assert(pict->data[0]); |
5800 //printf("out %d\n", (int)pict->data[0]); | |
5801 #if 0 //? | |
5802 | |
5803 /* Return the Picture timestamp as the frame number */ | |
5804 /* we substract 1 because it is added on utils.c */ | |
5805 avctx->frame_number = s->picture_number - 1; | |
5806 #endif | |
5807 #if 0 | |
5808 /* dont output the last pic after seeking */ | |
5809 if(s->last_picture_ptr || s->low_delay) | |
2392 | 5810 //Note this isnt a issue as a IDR pic should flush the buffers |
1168 | 5811 #endif |
5812 *data_size = sizeof(AVFrame); | |
5813 return get_consumed_bytes(s, buf_index, buf_size); | |
5814 } | |
5815 #if 0 | |
5816 static inline void fill_mb_avail(H264Context *h){ | |
5817 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
|
5818 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 5819 |
5820 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
|
5821 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
|
5822 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
|
5823 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num; |
1168 | 5824 }else{ |
5825 h->mb_avail[0]= | |
5826 h->mb_avail[1]= | |
5827 h->mb_avail[2]= 0; | |
5828 } | |
5829 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num; | |
5830 h->mb_avail[4]= 1; //FIXME move out | |
5831 h->mb_avail[5]= 0; //FIXME move out | |
5832 } | |
5833 #endif | |
5834 | |
5835 #if 0 //selftest | |
5836 #define COUNT 8000 | |
5837 #define SIZE (COUNT*40) | |
5838 int main(){ | |
5839 int i; | |
5840 uint8_t temp[SIZE]; | |
5841 PutBitContext pb; | |
5842 GetBitContext gb; | |
5843 // int int_temp[10000]; | |
5844 DSPContext dsp; | |
5845 AVCodecContext avctx; | |
5846 | |
5847 dsputil_init(&dsp, &avctx); | |
5848 | |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1453
diff
changeset
|
5849 init_put_bits(&pb, temp, SIZE); |
1168 | 5850 printf("testing unsigned exp golomb\n"); |
5851 for(i=0; i<COUNT; i++){ | |
5852 START_TIMER | |
5853 set_ue_golomb(&pb, i); | |
5854 STOP_TIMER("set_ue_golomb"); | |
5855 } | |
5856 flush_put_bits(&pb); | |
5857 | |
5858 init_get_bits(&gb, temp, 8*SIZE); | |
5859 for(i=0; i<COUNT; i++){ | |
5860 int j, s; | |
5861 | |
5862 s= show_bits(&gb, 24); | |
5863 | |
5864 START_TIMER | |
5865 j= get_ue_golomb(&gb); | |
5866 if(j != i){ | |
5867 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
5868 // return -1; | |
5869 } | |
5870 STOP_TIMER("get_ue_golomb"); | |
5871 } | |
5872 | |
5873 | |
1524 | 5874 init_put_bits(&pb, temp, SIZE); |
1168 | 5875 printf("testing signed exp golomb\n"); |
5876 for(i=0; i<COUNT; i++){ | |
5877 START_TIMER | |
5878 set_se_golomb(&pb, i - COUNT/2); | |
5879 STOP_TIMER("set_se_golomb"); | |
5880 } | |
5881 flush_put_bits(&pb); | |
5882 | |
5883 init_get_bits(&gb, temp, 8*SIZE); | |
5884 for(i=0; i<COUNT; i++){ | |
5885 int j, s; | |
5886 | |
5887 s= show_bits(&gb, 24); | |
5888 | |
5889 START_TIMER | |
5890 j= get_se_golomb(&gb); | |
5891 if(j != i - COUNT/2){ | |
5892 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
5893 // return -1; | |
5894 } | |
5895 STOP_TIMER("get_se_golomb"); | |
5896 } | |
5897 | |
5898 printf("testing 4x4 (I)DCT\n"); | |
5899 | |
5900 DCTELEM block[16]; | |
5901 uint8_t src[16], ref[16]; | |
5902 uint64_t error= 0, max_error=0; | |
5903 | |
5904 for(i=0; i<COUNT; i++){ | |
5905 int j; | |
5906 // printf("%d %d %d\n", r1, r2, (r2-r1)*16); | |
5907 for(j=0; j<16; j++){ | |
5908 ref[j]= random()%255; | |
5909 src[j]= random()%255; | |
5910 } | |
5911 | |
5912 h264_diff_dct_c(block, src, ref, 4); | |
5913 | |
5914 //normalize | |
5915 for(j=0; j<16; j++){ | |
5916 // printf("%d ", block[j]); | |
5917 block[j]= block[j]*4; | |
5918 if(j&1) block[j]= (block[j]*4 + 2)/5; | |
5919 if(j&4) block[j]= (block[j]*4 + 2)/5; | |
5920 } | |
5921 // printf("\n"); | |
5922 | |
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
5923 s->dsp.h264_idct_add(ref, block, 4); |
1168 | 5924 /* for(j=0; j<16; j++){ |
5925 printf("%d ", ref[j]); | |
5926 } | |
5927 printf("\n");*/ | |
5928 | |
5929 for(j=0; j<16; j++){ | |
5930 int diff= ABS(src[j] - ref[j]); | |
5931 | |
5932 error+= diff*diff; | |
5933 max_error= FFMAX(max_error, diff); | |
5934 } | |
5935 } | |
5936 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error ); | |
5937 #if 0 | |
5938 printf("testing quantizer\n"); | |
5939 for(qp=0; qp<52; qp++){ | |
5940 for(i=0; i<16; i++) | |
5941 src1_block[i]= src2_block[i]= random()%255; | |
5942 | |
5943 } | |
5944 #endif | |
5945 printf("Testing NAL layer\n"); | |
5946 | |
5947 uint8_t bitstream[COUNT]; | |
5948 uint8_t nal[COUNT*2]; | |
5949 H264Context h; | |
5950 memset(&h, 0, sizeof(H264Context)); | |
5951 | |
5952 for(i=0; i<COUNT; i++){ | |
5953 int zeros= i; | |
5954 int nal_length; | |
5955 int consumed; | |
5956 int out_length; | |
5957 uint8_t *out; | |
5958 int j; | |
5959 | |
5960 for(j=0; j<COUNT; j++){ | |
5961 bitstream[j]= (random() % 255) + 1; | |
5962 } | |
5963 | |
5964 for(j=0; j<zeros; j++){ | |
5965 int pos= random() % COUNT; | |
5966 while(bitstream[pos] == 0){ | |
5967 pos++; | |
5968 pos %= COUNT; | |
5969 } | |
5970 bitstream[pos]=0; | |
5971 } | |
5972 | |
5973 START_TIMER | |
5974 | |
5975 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2); | |
5976 if(nal_length<0){ | |
5977 printf("encoding failed\n"); | |
5978 return -1; | |
5979 } | |
5980 | |
5981 out= decode_nal(&h, nal, &out_length, &consumed, nal_length); | |
5982 | |
5983 STOP_TIMER("NAL") | |
5984 | |
5985 if(out_length != COUNT){ | |
5986 printf("incorrect length %d %d\n", out_length, COUNT); | |
5987 return -1; | |
5988 } | |
5989 | |
5990 if(consumed != nal_length){ | |
5991 printf("incorrect consumed length %d %d\n", nal_length, consumed); | |
5992 return -1; | |
5993 } | |
5994 | |
5995 if(memcmp(bitstream, out, COUNT)){ | |
5996 printf("missmatch\n"); | |
5997 return -1; | |
5998 } | |
5999 } | |
6000 | |
6001 printf("Testing RBSP\n"); | |
6002 | |
6003 | |
6004 return 0; | |
6005 } | |
6006 #endif | |
6007 | |
6008 | |
6009 static int decode_end(AVCodecContext *avctx) | |
6010 { | |
6011 H264Context *h = avctx->priv_data; | |
6012 MpegEncContext *s = &h->s; | |
6013 | |
6014 free_tables(h); //FIXME cleanup init stuff perhaps | |
6015 MPV_common_end(s); | |
6016 | |
6017 // memset(h, 0, sizeof(H264Context)); | |
6018 | |
6019 return 0; | |
6020 } | |
6021 | |
6022 | |
6023 AVCodec h264_decoder = { | |
6024 "h264", | |
6025 CODEC_TYPE_VIDEO, | |
6026 CODEC_ID_H264, | |
6027 sizeof(H264Context), | |
6028 decode_init, | |
6029 NULL, | |
6030 decode_end, | |
6031 decode_frame, | |
1214 | 6032 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED, |
1168 | 6033 }; |
6034 | |
1988 | 6035 AVCodecParser h264_parser = { |
6036 { CODEC_ID_H264 }, | |
2392 | 6037 sizeof(H264Context), |
1988 | 6038 NULL, |
6039 h264_parse, | |
6040 ff_parse_close, | |
6041 }; | |
6042 | |
1234 | 6043 #include "svq3.c" |