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