Mercurial > libavcodec.hg
annotate h264.c @ 2551:615995277bc5 libavcodec
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
author | michael |
---|---|
date | Sun, 06 Mar 2005 23:02:25 +0000 |
parents | bca31bc0cbae |
children | 48c1b17233e8 |
rev | line source |
---|---|
1168 | 1 /* |
2 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder | |
3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> | |
4 * | |
5 * This library is free software; you can redistribute it and/or | |
6 * modify it under the terms of the GNU Lesser General Public | |
7 * License as published by the Free Software Foundation; either | |
8 * version 2 of the License, or (at your option) any later version. | |
9 * | |
10 * This library is distributed in the hope that it will be useful, | |
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 * Lesser General Public License for more details. | |
14 * | |
15 * You should have received a copy of the GNU Lesser General Public | |
16 * License along with this library; if not, write to the Free Software | |
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
18 * | |
19 */ | |
20 | |
21 /** | |
22 * @file h264.c | |
23 * H.264 / AVC / MPEG4 part10 codec. | |
24 * @author Michael Niedermayer <michaelni@gmx.at> | |
25 */ | |
26 | |
27 #include "common.h" | |
28 #include "dsputil.h" | |
29 #include "avcodec.h" | |
30 #include "mpegvideo.h" | |
31 #include "h264data.h" | |
32 #include "golomb.h" | |
33 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
34 #include "cabac.h" |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
35 |
1168 | 36 #undef NDEBUG |
37 #include <assert.h> | |
38 | |
39 #define interlaced_dct interlaced_dct_is_a_bad_name | |
40 #define mb_intra mb_intra_isnt_initalized_see_mb_type | |
41 | |
42 #define LUMA_DC_BLOCK_INDEX 25 | |
43 #define CHROMA_DC_BLOCK_INDEX 26 | |
44 | |
45 #define CHROMA_DC_COEFF_TOKEN_VLC_BITS 8 | |
46 #define COEFF_TOKEN_VLC_BITS 8 | |
47 #define TOTAL_ZEROS_VLC_BITS 9 | |
48 #define CHROMA_DC_TOTAL_ZEROS_VLC_BITS 3 | |
49 #define RUN_VLC_BITS 3 | |
50 #define RUN7_VLC_BITS 6 | |
51 | |
52 #define MAX_SPS_COUNT 32 | |
53 #define MAX_PPS_COUNT 256 | |
54 | |
55 #define MAX_MMCO_COUNT 66 | |
56 | |
57 /** | |
58 * Sequence parameter set | |
59 */ | |
60 typedef struct SPS{ | |
61 | |
62 int profile_idc; | |
63 int level_idc; | |
64 int log2_max_frame_num; ///< log2_max_frame_num_minus4 + 4 | |
65 int poc_type; ///< pic_order_cnt_type | |
66 int log2_max_poc_lsb; ///< log2_max_pic_order_cnt_lsb_minus4 | |
67 int delta_pic_order_always_zero_flag; | |
68 int offset_for_non_ref_pic; | |
69 int offset_for_top_to_bottom_field; | |
70 int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle | |
71 int ref_frame_count; ///< num_ref_frames | |
1371 | 72 int gaps_in_frame_num_allowed_flag; |
1168 | 73 int mb_width; ///< frame_width_in_mbs_minus1 + 1 |
74 int mb_height; ///< frame_height_in_mbs_minus1 + 1 | |
75 int frame_mbs_only_flag; | |
76 int mb_aff; ///<mb_adaptive_frame_field_flag | |
77 int direct_8x8_inference_flag; | |
1371 | 78 int crop; ///< frame_cropping_flag |
79 int crop_left; ///< frame_cropping_rect_left_offset | |
80 int crop_right; ///< frame_cropping_rect_right_offset | |
81 int crop_top; ///< frame_cropping_rect_top_offset | |
82 int crop_bottom; ///< frame_cropping_rect_bottom_offset | |
1168 | 83 int vui_parameters_present_flag; |
1548 | 84 AVRational sar; |
2174
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
85 int timing_info_present_flag; |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
86 uint32_t num_units_in_tick; |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
87 uint32_t time_scale; |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
88 int fixed_frame_rate_flag; |
1168 | 89 short offset_for_ref_frame[256]; //FIXME dyn aloc? |
90 }SPS; | |
91 | |
92 /** | |
93 * Picture parameter set | |
94 */ | |
95 typedef struct PPS{ | |
96 int sps_id; | |
97 int cabac; ///< entropy_coding_mode_flag | |
98 int pic_order_present; ///< pic_order_present_flag | |
99 int slice_group_count; ///< num_slice_groups_minus1 + 1 | |
100 int mb_slice_group_map_type; | |
101 int ref_count[2]; ///< num_ref_idx_l0/1_active_minus1 + 1 | |
102 int weighted_pred; ///< weighted_pred_flag | |
103 int weighted_bipred_idc; | |
104 int init_qp; ///< pic_init_qp_minus26 + 26 | |
105 int init_qs; ///< pic_init_qs_minus26 + 26 | |
106 int chroma_qp_index_offset; | |
107 int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag | |
108 int constrained_intra_pred; ///< constrained_intra_pred_flag | |
109 int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag | |
110 }PPS; | |
111 | |
112 /** | |
113 * Memory management control operation opcode. | |
114 */ | |
115 typedef enum MMCOOpcode{ | |
116 MMCO_END=0, | |
117 MMCO_SHORT2UNUSED, | |
118 MMCO_LONG2UNUSED, | |
119 MMCO_SHORT2LONG, | |
120 MMCO_SET_MAX_LONG, | |
121 MMCO_RESET, | |
122 MMCO_LONG, | |
123 } MMCOOpcode; | |
124 | |
125 /** | |
126 * Memory management control operation. | |
127 */ | |
128 typedef struct MMCO{ | |
129 MMCOOpcode opcode; | |
130 int short_frame_num; | |
131 int long_index; | |
132 } MMCO; | |
133 | |
134 /** | |
135 * H264Context | |
136 */ | |
137 typedef struct H264Context{ | |
138 MpegEncContext s; | |
139 int nal_ref_idc; | |
140 int nal_unit_type; | |
141 #define NAL_SLICE 1 | |
142 #define NAL_DPA 2 | |
143 #define NAL_DPB 3 | |
144 #define NAL_DPC 4 | |
145 #define NAL_IDR_SLICE 5 | |
146 #define NAL_SEI 6 | |
147 #define NAL_SPS 7 | |
148 #define NAL_PPS 8 | |
149 #define NAL_PICTURE_DELIMITER 9 | |
150 #define NAL_FILTER_DATA 10 | |
151 uint8_t *rbsp_buffer; | |
152 int rbsp_buffer_size; | |
153 | |
2227 | 154 /** |
155 * Used to parse AVC variant of h264 | |
156 */ | |
157 int is_avc; ///< this flag is != 0 if codec is avc1 | |
158 int got_avcC; ///< flag used to parse avcC data only once | |
159 int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) | |
160 | |
1168 | 161 int chroma_qp; //QPc |
162 | |
163 int prev_mb_skiped; //FIXME remove (IMHO not used) | |
164 | |
165 //prediction stuff | |
166 int chroma_pred_mode; | |
167 int intra16x16_pred_mode; | |
168 | |
169 int8_t intra4x4_pred_mode_cache[5*8]; | |
170 int8_t (*intra4x4_pred_mode)[8]; | |
171 void (*pred4x4 [9+3])(uint8_t *src, uint8_t *topright, int stride);//FIXME move to dsp? | |
172 void (*pred8x8 [4+3])(uint8_t *src, int stride); | |
173 void (*pred16x16[4+3])(uint8_t *src, int stride); | |
174 unsigned int topleft_samples_available; | |
175 unsigned int top_samples_available; | |
176 unsigned int topright_samples_available; | |
177 unsigned int left_samples_available; | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
178 uint8_t (*top_border)[16+2*8]; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
179 uint8_t left_border[17+2*9]; |
1168 | 180 |
181 /** | |
182 * non zero coeff count cache. | |
183 * is 64 if not available. | |
184 */ | |
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
185 uint8_t non_zero_count_cache[6*8] __align8; |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
186 uint8_t (*non_zero_count)[16]; |
1168 | 187 |
188 /** | |
189 * Motion vector cache. | |
190 */ | |
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
191 int16_t mv_cache[2][5*8][2] __align8; |
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
192 int8_t ref_cache[2][5*8] __align8; |
1168 | 193 #define LIST_NOT_USED -1 //FIXME rename? |
194 #define PART_NOT_AVAILABLE -2 | |
195 | |
196 /** | |
197 * is 1 if the specific list MV&references are set to 0,0,-2. | |
198 */ | |
199 int mv_cache_clean[2]; | |
200 | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
201 /** |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
202 * block_offset[ 0..23] for frame macroblocks |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
203 * block_offset[24..47] for field macroblocks |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
204 */ |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
205 int block_offset[2*(16+8)]; |
1168 | 206 |
207 uint16_t *mb2b_xy; //FIXME are these 4 a good idea? | |
208 uint16_t *mb2b8_xy; | |
2395 | 209 int b_stride; //FIXME use s->b4_stride |
1168 | 210 int b8_stride; |
211 | |
1234 | 212 int halfpel_flag; |
213 int thirdpel_flag; | |
214 | |
1319 | 215 int unknown_svq3_flag; |
216 int next_slice_index; | |
217 | |
1168 | 218 SPS sps_buffer[MAX_SPS_COUNT]; |
219 SPS sps; ///< current sps | |
220 | |
221 PPS pps_buffer[MAX_PPS_COUNT]; | |
222 /** | |
223 * current pps | |
224 */ | |
225 PPS pps; //FIXME move tp Picture perhaps? (->no) do we need that? | |
226 | |
227 int slice_num; | |
228 uint8_t *slice_table_base; | |
229 uint8_t *slice_table; ///< slice_table_base + mb_stride + 1 | |
230 int slice_type; | |
231 int slice_type_fixed; | |
232 | |
233 //interlacing specific flags | |
234 int mb_field_decoding_flag; | |
235 | |
236 int sub_mb_type[4]; | |
237 | |
238 //POC stuff | |
239 int poc_lsb; | |
240 int poc_msb; | |
241 int delta_poc_bottom; | |
242 int delta_poc[2]; | |
243 int frame_num; | |
244 int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0 | |
245 int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0 | |
246 int frame_num_offset; ///< for POC type 2 | |
247 int prev_frame_num_offset; ///< for POC type 2 | |
248 int prev_frame_num; ///< frame_num of the last pic for POC type 1/2 | |
249 | |
250 /** | |
251 * frame_num for frames or 2*frame_num for field pics. | |
252 */ | |
253 int curr_pic_num; | |
254 | |
255 /** | |
256 * max_frame_num or 2*max_frame_num for field pics. | |
257 */ | |
258 int max_pic_num; | |
259 | |
260 //Weighted pred stuff | |
2415 | 261 int use_weight; |
262 int use_weight_chroma; | |
1168 | 263 int luma_log2_weight_denom; |
264 int chroma_log2_weight_denom; | |
265 int luma_weight[2][16]; | |
266 int luma_offset[2][16]; | |
267 int chroma_weight[2][16][2]; | |
268 int chroma_offset[2][16][2]; | |
2415 | 269 int implicit_weight[16][16]; |
1168 | 270 |
271 //deblock | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
272 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
|
273 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
|
274 int slice_beta_offset; |
1168 | 275 |
276 int redundant_pic_count; | |
277 | |
278 int direct_spatial_mv_pred; | |
2396 | 279 int dist_scale_factor[16]; |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
280 int map_col_to_list0[2][16]; |
1168 | 281 |
282 /** | |
283 * num_ref_idx_l0/1_active_minus1 + 1 | |
284 */ | |
285 int ref_count[2];// FIXME split for AFF | |
286 Picture *short_ref[16]; | |
287 Picture *long_ref[16]; | |
288 Picture default_ref_list[2][32]; | |
289 Picture ref_list[2][32]; //FIXME size? | |
290 Picture field_ref_list[2][32]; //FIXME size? | |
2409 | 291 Picture *delayed_pic[16]; //FIXME size? |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
292 int delayed_output_poc; |
1168 | 293 |
294 /** | |
295 * memory management control operations buffer. | |
296 */ | |
297 MMCO mmco[MAX_MMCO_COUNT]; | |
298 int mmco_index; | |
299 | |
300 int long_ref_count; ///< number of actual long term references | |
301 int short_ref_count; ///< number of actual short term references | |
302 | |
303 //data partitioning | |
304 GetBitContext intra_gb; | |
305 GetBitContext inter_gb; | |
306 GetBitContext *intra_gb_ptr; | |
307 GetBitContext *inter_gb_ptr; | |
308 | |
309 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
|
310 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
311 /** |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
312 * Cabac |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
313 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
314 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
|
315 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
|
316 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
|
317 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
318 /* 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
|
319 uint16_t *cbp_table; |
2314 | 320 int top_cbp; |
321 int left_cbp; | |
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
322 /* 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
|
323 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
|
324 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
|
325 int16_t (*mvd_table[2])[2]; |
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
326 int16_t mvd_cache[2][5*8][2] __align8; |
2396 | 327 uint8_t *direct_table; |
328 uint8_t direct_cache[5*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
|
329 |
1168 | 330 }H264Context; |
331 | |
332 static VLC coeff_token_vlc[4]; | |
333 static VLC chroma_dc_coeff_token_vlc; | |
334 | |
335 static VLC total_zeros_vlc[15]; | |
336 static VLC chroma_dc_total_zeros_vlc[3]; | |
337 | |
338 static VLC run_vlc[6]; | |
339 static VLC run7_vlc; | |
340 | |
1234 | 341 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); |
342 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
|
343 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 | 344 |
1269 | 345 static inline uint32_t pack16to32(int a, int b){ |
346 #ifdef WORDS_BIGENDIAN | |
347 return (b&0xFFFF) + (a<<16); | |
348 #else | |
349 return (a&0xFFFF) + (b<<16); | |
350 #endif | |
351 } | |
352 | |
1168 | 353 /** |
354 * fill a rectangle. | |
2392 | 355 * @param h height of the rectangle, should be a constant |
356 * @param w width of the rectangle, should be a constant | |
1168 | 357 * @param size the size of val (1 or 4), should be a constant |
358 */ | |
1187 | 359 static inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){ //FIXME ensure this IS inlined |
360 uint8_t *p= (uint8_t*)vp; | |
1168 | 361 assert(size==1 || size==4); |
362 | |
363 w *= size; | |
364 stride *= size; | |
365 | |
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
366 assert((((int)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0); |
1168 | 367 //FIXME check what gcc generates for 64 bit on x86 and possible write a 32 bit ver of it |
368 if(w==2 && h==2){ | |
369 *(uint16_t*)(p + 0)= | |
370 *(uint16_t*)(p + stride)= size==4 ? val : val*0x0101; | |
371 }else if(w==2 && h==4){ | |
372 *(uint16_t*)(p + 0*stride)= | |
373 *(uint16_t*)(p + 1*stride)= | |
374 *(uint16_t*)(p + 2*stride)= | |
375 *(uint16_t*)(p + 3*stride)= size==4 ? val : val*0x0101; | |
1252 | 376 }else if(w==4 && h==1){ |
377 *(uint32_t*)(p + 0*stride)= size==4 ? val : val*0x01010101; | |
1168 | 378 }else if(w==4 && h==2){ |
379 *(uint32_t*)(p + 0*stride)= | |
380 *(uint32_t*)(p + 1*stride)= size==4 ? val : val*0x01010101; | |
381 }else if(w==4 && h==4){ | |
382 *(uint32_t*)(p + 0*stride)= | |
383 *(uint32_t*)(p + 1*stride)= | |
384 *(uint32_t*)(p + 2*stride)= | |
385 *(uint32_t*)(p + 3*stride)= size==4 ? val : val*0x01010101; | |
386 }else if(w==8 && h==1){ | |
387 *(uint32_t*)(p + 0)= | |
388 *(uint32_t*)(p + 4)= size==4 ? val : val*0x01010101; | |
389 }else if(w==8 && h==2){ | |
390 *(uint32_t*)(p + 0 + 0*stride)= | |
391 *(uint32_t*)(p + 4 + 0*stride)= | |
392 *(uint32_t*)(p + 0 + 1*stride)= | |
393 *(uint32_t*)(p + 4 + 1*stride)= size==4 ? val : val*0x01010101; | |
394 }else if(w==8 && h==4){ | |
395 *(uint64_t*)(p + 0*stride)= | |
396 *(uint64_t*)(p + 1*stride)= | |
397 *(uint64_t*)(p + 2*stride)= | |
398 *(uint64_t*)(p + 3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
399 }else if(w==16 && h==2){ | |
400 *(uint64_t*)(p + 0+0*stride)= | |
401 *(uint64_t*)(p + 8+0*stride)= | |
402 *(uint64_t*)(p + 0+1*stride)= | |
403 *(uint64_t*)(p + 8+1*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
404 }else if(w==16 && h==4){ | |
405 *(uint64_t*)(p + 0+0*stride)= | |
406 *(uint64_t*)(p + 8+0*stride)= | |
407 *(uint64_t*)(p + 0+1*stride)= | |
408 *(uint64_t*)(p + 8+1*stride)= | |
409 *(uint64_t*)(p + 0+2*stride)= | |
410 *(uint64_t*)(p + 8+2*stride)= | |
411 *(uint64_t*)(p + 0+3*stride)= | |
412 *(uint64_t*)(p + 8+3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
413 }else | |
414 assert(0); | |
415 } | |
416 | |
2449 | 417 static inline void fill_caches(H264Context *h, int mb_type, int for_deblock){ |
1168 | 418 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
|
419 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 420 int topleft_xy, top_xy, topright_xy, left_xy[2]; |
421 int topleft_type, top_type, topright_type, left_type[2]; | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
422 int left_block[8]; |
1168 | 423 int i; |
424 | |
425 //wow what a mess, why didnt they simplify the interlacing&intra stuff, i cant imagine that these complex rules are worth it | |
426 | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
427 top_xy = mb_xy - s->mb_stride; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
428 topleft_xy = top_xy - 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
429 topright_xy= top_xy + 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
430 left_xy[1] = left_xy[0] = mb_xy-1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
431 left_block[0]= 0; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
432 left_block[1]= 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
433 left_block[2]= 2; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
434 left_block[3]= 3; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
435 left_block[4]= 7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
436 left_block[5]= 10; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
437 left_block[6]= 8; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
438 left_block[7]= 11; |
1168 | 439 if(h->sps.mb_aff){ |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
440 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
441 const int top_pair_xy = pair_xy - s->mb_stride; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
442 const int topleft_pair_xy = top_pair_xy - 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
443 const int topright_pair_xy = top_pair_xy + 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
444 const int topleft_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topleft_pair_xy]); |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
445 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]); |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
446 const int topright_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topright_pair_xy]); |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
447 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]); |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
448 const int curr_mb_frame_flag = !IS_INTERLACED(mb_type); |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
449 const int bottom = (s->mb_y & 1); |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
450 tprintf("fill_caches: curr_mb_frame_flag:%d, left_mb_frame_flag:%d, topleft_mb_frame_flag:%d, top_mb_frame_flag:%d, topright_mb_frame_flag:%d\n", curr_mb_frame_flag, left_mb_frame_flag, topleft_mb_frame_flag, top_mb_frame_flag, topright_mb_frame_flag); |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
451 if (bottom |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
452 ? !curr_mb_frame_flag // bottom macroblock |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
453 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
454 ) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
455 top_xy -= s->mb_stride; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
456 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
457 if (bottom |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
458 ? !curr_mb_frame_flag // bottom macroblock |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
459 : (!curr_mb_frame_flag && !topleft_mb_frame_flag) // top macroblock |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
460 ) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
461 topleft_xy -= s->mb_stride; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
462 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
463 if (bottom |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
464 ? !curr_mb_frame_flag // bottom macroblock |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
465 : (!curr_mb_frame_flag && !topright_mb_frame_flag) // top macroblock |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
466 ) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
467 topright_xy -= s->mb_stride; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
468 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
469 if (left_mb_frame_flag != curr_mb_frame_flag) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
470 left_xy[1] = left_xy[0] = pair_xy - 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
471 if (curr_mb_frame_flag) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
472 if (bottom) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
473 left_block[0]= 2; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
474 left_block[1]= 2; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
475 left_block[2]= 3; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
476 left_block[3]= 3; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
477 left_block[4]= 8; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
478 left_block[5]= 11; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
479 left_block[6]= 8; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
480 left_block[7]= 11; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
481 } else { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
482 left_block[0]= 0; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
483 left_block[1]= 0; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
484 left_block[2]= 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
485 left_block[3]= 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
486 left_block[4]= 7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
487 left_block[5]= 10; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
488 left_block[6]= 7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
489 left_block[7]= 10; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
490 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
491 } else { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
492 left_xy[1] += s->mb_stride; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
493 //left_block[0]= 0; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
494 left_block[1]= 2; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
495 left_block[2]= 0; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
496 left_block[3]= 2; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
497 //left_block[4]= 7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
498 left_block[5]= 10; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
499 left_block[6]= 7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
500 left_block[7]= 10; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
501 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
502 } |
1168 | 503 } |
504 | |
2449 | 505 if(for_deblock){ |
506 topleft_type = h->slice_table[topleft_xy ] < 255 ? s->current_picture.mb_type[topleft_xy] : 0; | |
507 top_type = h->slice_table[top_xy ] < 255 ? s->current_picture.mb_type[top_xy] : 0; | |
508 topright_type= h->slice_table[topright_xy] < 255 ? s->current_picture.mb_type[topright_xy]: 0; | |
509 left_type[0] = h->slice_table[left_xy[0] ] < 255 ? s->current_picture.mb_type[left_xy[0]] : 0; | |
510 left_type[1] = h->slice_table[left_xy[1] ] < 255 ? s->current_picture.mb_type[left_xy[1]] : 0; | |
511 }else{ | |
512 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0; | |
513 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0; | |
514 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0; | |
515 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0; | |
516 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0; | |
517 } | |
1168 | 518 |
519 if(IS_INTRA(mb_type)){ | |
520 h->topleft_samples_available= | |
521 h->top_samples_available= | |
522 h->left_samples_available= 0xFFFF; | |
523 h->topright_samples_available= 0xEEEA; | |
524 | |
525 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){ | |
526 h->topleft_samples_available= 0xB3FF; | |
527 h->top_samples_available= 0x33FF; | |
528 h->topright_samples_available= 0x26EA; | |
529 } | |
530 for(i=0; i<2; i++){ | |
531 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){ | |
532 h->topleft_samples_available&= 0xDF5F; | |
533 h->left_samples_available&= 0x5F5F; | |
534 } | |
535 } | |
536 | |
537 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred)) | |
538 h->topleft_samples_available&= 0x7FFF; | |
539 | |
540 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred)) | |
541 h->topright_samples_available&= 0xFBFF; | |
542 | |
543 if(IS_INTRA4x4(mb_type)){ | |
544 if(IS_INTRA4x4(top_type)){ | |
545 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4]; | |
546 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5]; | |
547 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6]; | |
548 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3]; | |
549 }else{ | |
550 int pred; | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
551 if(!top_type || (IS_INTER(top_type) && h->pps.constrained_intra_pred)) |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
552 pred= -1; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
553 else{ |
1168 | 554 pred= 2; |
555 } | |
556 h->intra4x4_pred_mode_cache[4+8*0]= | |
557 h->intra4x4_pred_mode_cache[5+8*0]= | |
558 h->intra4x4_pred_mode_cache[6+8*0]= | |
559 h->intra4x4_pred_mode_cache[7+8*0]= pred; | |
560 } | |
561 for(i=0; i<2; i++){ | |
562 if(IS_INTRA4x4(left_type[i])){ | |
563 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[0+2*i]]; | |
564 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[1+2*i]]; | |
565 }else{ | |
566 int pred; | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
567 if(!left_type[i] || (IS_INTER(left_type[i]) && h->pps.constrained_intra_pred)) |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
568 pred= -1; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
569 else{ |
1168 | 570 pred= 2; |
571 } | |
572 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= | |
573 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred; | |
574 } | |
575 } | |
576 } | |
577 } | |
578 | |
579 | |
580 /* | |
581 0 . T T. T T T T | |
582 1 L . .L . . . . | |
583 2 L . .L . . . . | |
584 3 . T TL . . . . | |
585 4 L . .L . . . . | |
586 5 L . .. . . . . | |
587 */ | |
588 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec) | |
589 if(top_type){ | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
590 h->non_zero_count_cache[4+8*0]= h->non_zero_count[top_xy][4]; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
591 h->non_zero_count_cache[5+8*0]= h->non_zero_count[top_xy][5]; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
592 h->non_zero_count_cache[6+8*0]= h->non_zero_count[top_xy][6]; |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
593 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3]; |
1168 | 594 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
595 h->non_zero_count_cache[1+8*0]= h->non_zero_count[top_xy][9]; |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
596 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8]; |
1168 | 597 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
598 h->non_zero_count_cache[1+8*3]= h->non_zero_count[top_xy][12]; |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
599 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11]; |
2314 | 600 |
601 h->top_cbp= h->cbp_table[top_xy]; | |
1168 | 602 }else{ |
603 h->non_zero_count_cache[4+8*0]= | |
604 h->non_zero_count_cache[5+8*0]= | |
605 h->non_zero_count_cache[6+8*0]= | |
606 h->non_zero_count_cache[7+8*0]= | |
607 | |
608 h->non_zero_count_cache[1+8*0]= | |
609 h->non_zero_count_cache[2+8*0]= | |
610 | |
611 h->non_zero_count_cache[1+8*3]= | |
2314 | 612 h->non_zero_count_cache[2+8*3]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
613 | |
614 if(IS_INTRA(mb_type)) h->top_cbp= 0x1C0; | |
615 else h->top_cbp= 0; | |
1168 | 616 } |
617 | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
618 for (i=0; i<2; i++) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
619 if(left_type[i]){ |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
620 h->non_zero_count_cache[3+8*1 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[0+2*i]]; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
621 h->non_zero_count_cache[3+8*2 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[1+2*i]]; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
622 h->non_zero_count_cache[0+8*1 + 8*i]= h->non_zero_count[left_xy[i]][left_block[4+2*i]]; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
623 h->non_zero_count_cache[0+8*4 + 8*i]= h->non_zero_count[left_xy[i]][left_block[5+2*i]]; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
624 h->left_cbp= h->cbp_table[left_xy[i]]; //FIXME interlacing |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
625 }else{ |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
626 h->non_zero_count_cache[3+8*1 + 2*8*i]= |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
627 h->non_zero_count_cache[3+8*2 + 2*8*i]= |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
628 h->non_zero_count_cache[0+8*1 + 8*i]= |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
629 h->non_zero_count_cache[0+8*4 + 8*i]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
630 |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
631 if(IS_INTRA(mb_type)) h->left_cbp= 0x1C0;//FIXME interlacing |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
632 else h->left_cbp= 0; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
633 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
634 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
635 |
1168 | 636 #if 1 |
2396 | 637 //FIXME direct mb can skip much of this |
638 if(IS_INTER(mb_type) || (IS_DIRECT(mb_type) && h->direct_spatial_mv_pred)){ | |
1168 | 639 int list; |
640 for(list=0; list<2; list++){ | |
2535 | 641 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !for_deblock){ |
1168 | 642 /*if(!h->mv_cache_clean[list]){ |
643 memset(h->mv_cache [list], 0, 8*5*2*sizeof(int16_t)); //FIXME clean only input? clean at all? | |
644 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t)); | |
645 h->mv_cache_clean[list]= 1; | |
646 }*/ | |
2396 | 647 continue; |
1168 | 648 } |
649 h->mv_cache_clean[list]= 0; | |
650 | |
651 if(IS_INTER(topleft_type)){ | |
652 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride; | |
653 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride; | |
654 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; | |
655 h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy]; | |
656 }else{ | |
657 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= 0; | |
658 h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
659 } | |
660 | |
661 if(IS_INTER(top_type)){ | |
662 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; | |
663 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride; | |
664 *(uint32_t*)h->mv_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 0]; | |
665 *(uint32_t*)h->mv_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 1]; | |
666 *(uint32_t*)h->mv_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 2]; | |
667 *(uint32_t*)h->mv_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 3]; | |
668 h->ref_cache[list][scan8[0] + 0 - 1*8]= | |
669 h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][b8_xy + 0]; | |
670 h->ref_cache[list][scan8[0] + 2 - 1*8]= | |
671 h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][b8_xy + 1]; | |
672 }else{ | |
673 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]= | |
674 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]= | |
675 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]= | |
676 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0; | |
677 *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101; | |
678 } | |
679 | |
680 if(IS_INTER(topright_type)){ | |
681 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride; | |
682 const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride; | |
683 *(uint32_t*)h->mv_cache[list][scan8[0] + 4 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; | |
684 h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][b8_xy]; | |
685 }else{ | |
686 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0; | |
687 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
688 } | |
689 | |
690 //FIXME unify cleanup or sth | |
691 if(IS_INTER(left_type[0])){ | |
692 const int b_xy= h->mb2b_xy[left_xy[0]] + 3; | |
693 const int b8_xy= h->mb2b8_xy[left_xy[0]] + 1; | |
694 *(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]]; | |
695 *(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]]; | |
696 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
697 h->ref_cache[list][scan8[0] - 1 + 1*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0]>>1)]; | |
698 }else{ | |
699 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 0*8]= | |
700 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 1*8]= 0; | |
701 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
702 h->ref_cache[list][scan8[0] - 1 + 1*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
703 } | |
704 | |
705 if(IS_INTER(left_type[1])){ | |
706 const int b_xy= h->mb2b_xy[left_xy[1]] + 3; | |
707 const int b8_xy= h->mb2b8_xy[left_xy[1]] + 1; | |
708 *(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]]; | |
709 *(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]]; | |
710 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
711 h->ref_cache[list][scan8[0] - 1 + 3*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[2]>>1)]; | |
712 }else{ | |
713 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 2*8]= | |
714 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 3*8]= 0; | |
715 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
716 h->ref_cache[list][scan8[0] - 1 + 3*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
717 } | |
718 | |
2449 | 719 if(for_deblock) |
720 continue; | |
721 | |
1168 | 722 h->ref_cache[list][scan8[5 ]+1] = |
723 h->ref_cache[list][scan8[7 ]+1] = | |
724 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewher else) | |
725 h->ref_cache[list][scan8[4 ]] = | |
726 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; | |
727 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]= | |
728 *(uint32_t*)h->mv_cache [list][scan8[7 ]+1]= | |
729 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewher else) | |
730 *(uint32_t*)h->mv_cache [list][scan8[4 ]]= | |
731 *(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
|
732 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
733 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
|
734 /* 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
|
735 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
|
736 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
|
737 *(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
|
738 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
739 *(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
|
740 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
741 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
742 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
|
743 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
|
744 *(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
|
745 *(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
|
746 *(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
|
747 *(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
|
748 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
749 *(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
|
750 *(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
|
751 *(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
|
752 *(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
|
753 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
754 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
|
755 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
|
756 *(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
|
757 *(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
|
758 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
759 *(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
|
760 *(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
|
761 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
762 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
|
763 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
|
764 *(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
|
765 *(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
|
766 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
767 *(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
|
768 *(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
|
769 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
770 *(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
|
771 *(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
|
772 *(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
|
773 *(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
|
774 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0; |
2396 | 775 |
776 if(h->slice_type == B_TYPE){ | |
777 fill_rectangle(&h->direct_cache[scan8[0]], 4, 4, 8, 0, 1); | |
778 | |
779 if(IS_DIRECT(top_type)){ | |
780 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101; | |
781 }else if(IS_8X8(top_type)){ | |
782 int b8_xy = h->mb2b8_xy[top_xy] + h->b8_stride; | |
783 h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy]; | |
784 h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 1]; | |
785 }else{ | |
786 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0; | |
787 } | |
788 | |
789 //FIXME interlacing | |
790 if(IS_DIRECT(left_type[0])){ | |
791 h->direct_cache[scan8[0] - 1 + 0*8]= | |
792 h->direct_cache[scan8[0] - 1 + 2*8]= 1; | |
793 }else if(IS_8X8(left_type[0])){ | |
794 int b8_xy = h->mb2b8_xy[left_xy[0]] + 1; | |
795 h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[b8_xy]; | |
796 h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[b8_xy + h->b8_stride]; | |
797 }else{ | |
798 h->direct_cache[scan8[0] - 1 + 0*8]= | |
799 h->direct_cache[scan8[0] - 1 + 2*8]= 0; | |
800 } | |
801 } | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
802 } |
1168 | 803 } |
804 } | |
805 #endif | |
806 } | |
807 | |
808 static inline void write_back_intra_pred_mode(H264Context *h){ | |
809 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
|
810 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 811 |
812 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1]; | |
813 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2]; | |
814 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3]; | |
815 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4]; | |
816 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4]; | |
817 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4]; | |
818 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4]; | |
819 } | |
820 | |
821 /** | |
822 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
823 */ | |
824 static inline int check_intra4x4_pred_mode(H264Context *h){ | |
825 MpegEncContext * const s = &h->s; | |
826 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0}; | |
827 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED}; | |
828 int i; | |
829 | |
830 if(!(h->top_samples_available&0x8000)){ | |
831 for(i=0; i<4; i++){ | |
832 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ]; | |
833 if(status<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
834 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 | 835 return -1; |
836 } else if(status){ | |
837 h->intra4x4_pred_mode_cache[scan8[0] + i]= status; | |
838 } | |
839 } | |
840 } | |
841 | |
842 if(!(h->left_samples_available&0x8000)){ | |
843 for(i=0; i<4; i++){ | |
844 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ]; | |
845 if(status<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
846 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 | 847 return -1; |
848 } else if(status){ | |
849 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status; | |
850 } | |
851 } | |
852 } | |
853 | |
854 return 0; | |
855 } //FIXME cleanup like next | |
856 | |
857 /** | |
858 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
859 */ | |
860 static inline int check_intra_pred_mode(H264Context *h, int mode){ | |
861 MpegEncContext * const s = &h->s; | |
862 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1}; | |
863 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8}; | |
864 | |
2392 | 865 if(mode < 0 || mode > 6) { |
866 av_log(h->s.avctx, AV_LOG_ERROR, "out of range intra chroma pred mode at %d %d\n", s->mb_x, s->mb_y); | |
2163 | 867 return -1; |
2392 | 868 } |
2163 | 869 |
1168 | 870 if(!(h->top_samples_available&0x8000)){ |
871 mode= top[ mode ]; | |
872 if(mode<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
873 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 | 874 return -1; |
875 } | |
876 } | |
877 | |
878 if(!(h->left_samples_available&0x8000)){ | |
879 mode= left[ mode ]; | |
880 if(mode<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
881 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 | 882 return -1; |
883 } | |
884 } | |
885 | |
886 return mode; | |
887 } | |
888 | |
889 /** | |
890 * gets the predicted intra4x4 prediction mode. | |
891 */ | |
892 static inline int pred_intra_mode(H264Context *h, int n){ | |
893 const int index8= scan8[n]; | |
894 const int left= h->intra4x4_pred_mode_cache[index8 - 1]; | |
895 const int top = h->intra4x4_pred_mode_cache[index8 - 8]; | |
896 const int min= FFMIN(left, top); | |
897 | |
1170 | 898 tprintf("mode:%d %d min:%d\n", left ,top, min); |
1168 | 899 |
900 if(min<0) return DC_PRED; | |
901 else return min; | |
902 } | |
903 | |
904 static inline void write_back_non_zero_count(H264Context *h){ | |
905 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
|
906 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
|
907 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
908 h->non_zero_count[mb_xy][0]= h->non_zero_count_cache[7+8*1]; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
909 h->non_zero_count[mb_xy][1]= h->non_zero_count_cache[7+8*2]; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
910 h->non_zero_count[mb_xy][2]= h->non_zero_count_cache[7+8*3]; |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
911 h->non_zero_count[mb_xy][3]= h->non_zero_count_cache[7+8*4]; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
912 h->non_zero_count[mb_xy][4]= h->non_zero_count_cache[4+8*4]; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
913 h->non_zero_count[mb_xy][5]= h->non_zero_count_cache[5+8*4]; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
914 h->non_zero_count[mb_xy][6]= h->non_zero_count_cache[6+8*4]; |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
915 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
916 h->non_zero_count[mb_xy][9]= h->non_zero_count_cache[1+8*2]; |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
917 h->non_zero_count[mb_xy][8]= h->non_zero_count_cache[2+8*2]; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
918 h->non_zero_count[mb_xy][7]= h->non_zero_count_cache[2+8*1]; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
919 |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
920 h->non_zero_count[mb_xy][12]=h->non_zero_count_cache[1+8*5]; |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
921 h->non_zero_count[mb_xy][11]=h->non_zero_count_cache[2+8*5]; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
922 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[2+8*4]; |
1168 | 923 } |
924 | |
925 /** | |
926 * gets the predicted number of non zero coefficients. | |
927 * @param n block index | |
928 */ | |
929 static inline int pred_non_zero_count(H264Context *h, int n){ | |
930 const int index8= scan8[n]; | |
931 const int left= h->non_zero_count_cache[index8 - 1]; | |
932 const int top = h->non_zero_count_cache[index8 - 8]; | |
933 int i= left + top; | |
934 | |
935 if(i<64) i= (i+1)>>1; | |
936 | |
1170 | 937 tprintf("pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31); |
1168 | 938 |
939 return i&31; | |
940 } | |
941 | |
1169 | 942 static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width){ |
943 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ]; | |
944 | |
945 if(topright_ref != PART_NOT_AVAILABLE){ | |
946 *C= h->mv_cache[list][ i - 8 + part_width ]; | |
947 return topright_ref; | |
948 }else{ | |
1170 | 949 tprintf("topright MV not available\n"); |
950 | |
1169 | 951 *C= h->mv_cache[list][ i - 8 - 1 ]; |
952 return h->ref_cache[list][ i - 8 - 1 ]; | |
953 } | |
954 } | |
955 | |
1168 | 956 /** |
957 * gets the predicted MV. | |
958 * @param n the block index | |
959 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4) | |
960 * @param mx the x component of the predicted motion vector | |
961 * @param my the y component of the predicted motion vector | |
962 */ | |
963 static inline void pred_motion(H264Context * const h, int n, int part_width, int list, int ref, int * const mx, int * const my){ | |
964 const int index8= scan8[n]; | |
965 const int top_ref= h->ref_cache[list][ index8 - 8 ]; | |
966 const int left_ref= h->ref_cache[list][ index8 - 1 ]; | |
967 const int16_t * const A= h->mv_cache[list][ index8 - 1 ]; | |
968 const int16_t * const B= h->mv_cache[list][ index8 - 8 ]; | |
1169 | 969 const int16_t * C; |
970 int diagonal_ref, match_count; | |
971 | |
1168 | 972 assert(part_width==1 || part_width==2 || part_width==4); |
1169 | 973 |
1168 | 974 /* mv_cache |
975 B . . A T T T T | |
976 U . . L . . , . | |
977 U . . L . . . . | |
978 U . . L . . , . | |
979 . . . L . . . . | |
980 */ | |
1169 | 981 |
982 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width); | |
983 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref); | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
984 tprintf("pred_motion match_count=%d\n", match_count); |
1169 | 985 if(match_count > 1){ //most common |
986 *mx= mid_pred(A[0], B[0], C[0]); | |
987 *my= mid_pred(A[1], B[1], C[1]); | |
988 }else if(match_count==1){ | |
989 if(left_ref==ref){ | |
990 *mx= A[0]; | |
991 *my= A[1]; | |
992 }else if(top_ref==ref){ | |
993 *mx= B[0]; | |
994 *my= B[1]; | |
995 }else{ | |
996 *mx= C[0]; | |
997 *my= C[1]; | |
998 } | |
999 }else{ | |
1000 if(top_ref == PART_NOT_AVAILABLE && diagonal_ref == PART_NOT_AVAILABLE && left_ref != PART_NOT_AVAILABLE){ | |
1001 *mx= A[0]; | |
1002 *my= A[1]; | |
1168 | 1003 }else{ |
1004 *mx= mid_pred(A[0], B[0], C[0]); | |
1005 *my= mid_pred(A[1], B[1], C[1]); | |
1006 } | |
1169 | 1007 } |
1168 | 1008 |
1187 | 1009 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 | 1010 } |
1011 | |
1012 /** | |
1013 * gets the directionally predicted 16x8 MV. | |
1014 * @param n the block index | |
1015 * @param mx the x component of the predicted motion vector | |
1016 * @param my the y component of the predicted motion vector | |
1017 */ | |
1018 static inline void pred_16x8_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
1019 if(n==0){ | |
1020 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ]; | |
1021 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ]; | |
1022 | |
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1023 tprintf("pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n", top_ref, B[0], B[1], h->s.mb_x, h->s.mb_y, n, list); |
1168 | 1024 |
1025 if(top_ref == ref){ | |
1026 *mx= B[0]; | |
1027 *my= B[1]; | |
1028 return; | |
1029 } | |
1030 }else{ | |
1031 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ]; | |
1032 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ]; | |
1033 | |
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1034 tprintf("pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list); |
1168 | 1035 |
1036 if(left_ref == ref){ | |
1037 *mx= A[0]; | |
1038 *my= A[1]; | |
1039 return; | |
1040 } | |
1041 } | |
1042 | |
1043 //RARE | |
1044 pred_motion(h, n, 4, list, ref, mx, my); | |
1045 } | |
1046 | |
1047 /** | |
1048 * gets the directionally predicted 8x16 MV. | |
1049 * @param n the block index | |
1050 * @param mx the x component of the predicted motion vector | |
1051 * @param my the y component of the predicted motion vector | |
1052 */ | |
1053 static inline void pred_8x16_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
1054 if(n==0){ | |
1055 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ]; | |
1056 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ]; | |
1057 | |
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1058 tprintf("pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list); |
1168 | 1059 |
1060 if(left_ref == ref){ | |
1061 *mx= A[0]; | |
1062 *my= A[1]; | |
1063 return; | |
1064 } | |
1065 }else{ | |
1169 | 1066 const int16_t * C; |
1067 int diagonal_ref; | |
1068 | |
1069 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2); | |
1168 | 1070 |
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1071 tprintf("pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n", diagonal_ref, C[0], C[1], h->s.mb_x, h->s.mb_y, n, list); |
1168 | 1072 |
1169 | 1073 if(diagonal_ref == ref){ |
1168 | 1074 *mx= C[0]; |
1075 *my= C[1]; | |
1076 return; | |
1077 } | |
1078 } | |
1079 | |
1080 //RARE | |
1081 pred_motion(h, n, 2, list, ref, mx, my); | |
1082 } | |
1083 | |
1084 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){ | |
1085 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ]; | |
1086 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ]; | |
1087 | |
2392 | 1088 tprintf("pred_pskip: (%d) (%d) at %2d %2d\n", top_ref, left_ref, h->s.mb_x, h->s.mb_y); |
1168 | 1089 |
1090 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE | |
1091 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0) | |
1092 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){ | |
1093 | |
1094 *mx = *my = 0; | |
1095 return; | |
1096 } | |
1097 | |
1098 pred_motion(h, 0, 4, 0, 0, mx, my); | |
1099 | |
1100 return; | |
1101 } | |
1102 | |
2396 | 1103 static inline void direct_dist_scale_factor(H264Context * const h){ |
1104 const int poc = h->s.current_picture_ptr->poc; | |
1105 const int poc1 = h->ref_list[1][0].poc; | |
1106 int i; | |
1107 for(i=0; i<h->ref_count[0]; i++){ | |
1108 int poc0 = h->ref_list[0][i].poc; | |
1109 int td = clip(poc1 - poc0, -128, 127); | |
1110 if(td == 0 /* FIXME || pic0 is a long-term ref */){ | |
1111 h->dist_scale_factor[i] = 256; | |
1112 }else{ | |
1113 int tb = clip(poc - poc0, -128, 127); | |
1114 int tx = (16384 + (ABS(td) >> 1)) / td; | |
1115 h->dist_scale_factor[i] = clip((tb*tx + 32) >> 6, -1024, 1023); | |
1116 } | |
1117 } | |
1118 } | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1119 static inline void direct_ref_list_init(H264Context * const h){ |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1120 MpegEncContext * const s = &h->s; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1121 Picture * const ref1 = &h->ref_list[1][0]; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1122 Picture * const cur = s->current_picture_ptr; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1123 int list, i, j; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1124 if(cur->pict_type == I_TYPE) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1125 cur->ref_count[0] = 0; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1126 if(cur->pict_type != B_TYPE) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1127 cur->ref_count[1] = 0; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1128 for(list=0; list<2; list++){ |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1129 cur->ref_count[list] = h->ref_count[list]; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1130 for(j=0; j<h->ref_count[list]; j++) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1131 cur->ref_poc[list][j] = h->ref_list[list][j].poc; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1132 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1133 if(cur->pict_type != B_TYPE || h->direct_spatial_mv_pred) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1134 return; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1135 for(list=0; list<2; list++){ |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1136 for(i=0; i<ref1->ref_count[list]; i++){ |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1137 const int poc = ref1->ref_poc[list][i]; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1138 h->map_col_to_list0[list][i] = PART_NOT_AVAILABLE; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1139 for(j=0; j<h->ref_count[list]; j++) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1140 if(h->ref_list[list][j].poc == poc){ |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1141 h->map_col_to_list0[list][i] = j; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1142 break; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1143 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1144 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1145 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1146 } |
2396 | 1147 |
1148 static inline void pred_direct_motion(H264Context * const h, int *mb_type){ | |
1149 MpegEncContext * const s = &h->s; | |
1150 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; | |
1151 const int b8_xy = 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
1152 const int b4_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
1153 const int mb_type_col = h->ref_list[1][0].mb_type[mb_xy]; | |
1154 const int16_t (*l1mv0)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[0][b4_xy]; | |
1155 const int8_t *l1ref0 = &h->ref_list[1][0].ref_index[0][b8_xy]; | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1156 const int8_t *l1ref1 = &h->ref_list[1][0].ref_index[1][b8_xy]; |
2396 | 1157 const int is_b8x8 = IS_8X8(*mb_type); |
1158 int sub_mb_type; | |
1159 int i8, i4; | |
1160 | |
1161 if(IS_8X8(mb_type_col) && !h->sps.direct_8x8_inference_flag){ | |
1162 /* FIXME save sub mb types from previous frames (or derive from MVs) | |
1163 * so we know exactly what block size to use */ | |
1164 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */ | |
2536 | 1165 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
2396 | 1166 }else if(!is_b8x8 && (IS_16X16(mb_type_col) || IS_INTRA(mb_type_col))){ |
1167 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ | |
1168 *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */ | |
1169 }else{ | |
1170 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ | |
2536 | 1171 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
2396 | 1172 } |
1173 if(!is_b8x8) | |
1174 *mb_type |= MB_TYPE_DIRECT2; | |
1175 | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
1176 tprintf("mb_type = %08x, sub_mb_type = %08x, is_b8x8 = %d, mb_type_col = %08x\n", *mb_type, sub_mb_type, is_b8x8, mb_type_col); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
1177 |
2396 | 1178 if(h->direct_spatial_mv_pred){ |
1179 int ref[2]; | |
1180 int mv[2][2]; | |
1181 int list; | |
1182 | |
1183 /* ref = min(neighbors) */ | |
1184 for(list=0; list<2; list++){ | |
1185 int refa = h->ref_cache[list][scan8[0] - 1]; | |
1186 int refb = h->ref_cache[list][scan8[0] - 8]; | |
1187 int refc = h->ref_cache[list][scan8[0] - 8 + 4]; | |
1188 if(refc == -2) | |
1189 refc = h->ref_cache[list][scan8[0] - 8 - 1]; | |
1190 ref[list] = refa; | |
1191 if(ref[list] < 0 || (refb < ref[list] && refb >= 0)) | |
1192 ref[list] = refb; | |
1193 if(ref[list] < 0 || (refc < ref[list] && refc >= 0)) | |
1194 ref[list] = refc; | |
1195 if(ref[list] < 0) | |
1196 ref[list] = -1; | |
1197 } | |
1198 | |
1199 if(ref[0] < 0 && ref[1] < 0){ | |
1200 ref[0] = ref[1] = 0; | |
1201 mv[0][0] = mv[0][1] = | |
1202 mv[1][0] = mv[1][1] = 0; | |
1203 }else{ | |
1204 for(list=0; list<2; list++){ | |
1205 if(ref[list] >= 0) | |
1206 pred_motion(h, 0, 4, list, ref[list], &mv[list][0], &mv[list][1]); | |
1207 else | |
1208 mv[list][0] = mv[list][1] = 0; | |
1209 } | |
1210 } | |
1211 | |
1212 if(ref[1] < 0){ | |
1213 *mb_type &= ~MB_TYPE_P0L1; | |
1214 sub_mb_type &= ~MB_TYPE_P0L1; | |
1215 }else if(ref[0] < 0){ | |
1216 *mb_type &= ~MB_TYPE_P0L0; | |
1217 sub_mb_type &= ~MB_TYPE_P0L0; | |
1218 } | |
1219 | |
1220 if(IS_16X16(*mb_type)){ | |
1221 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref[0], 1); | |
1222 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, ref[1], 1); | |
1223 if(!IS_INTRA(mb_type_col) && l1ref0[0] == 0 && | |
1224 ABS(l1mv0[0][0]) <= 1 && ABS(l1mv0[0][1]) <= 1){ | |
1225 if(ref[0] > 0) | |
1226 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
1227 else | |
1228 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
1229 if(ref[1] > 0) | |
1230 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
1231 else | |
1232 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
1233 }else{ | |
1234 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
1235 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
1236 } | |
1237 }else{ | |
1238 for(i8=0; i8<4; i8++){ | |
1239 const int x8 = i8&1; | |
1240 const int y8 = i8>>1; | |
1241 | |
1242 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
1243 continue; | |
1244 h->sub_mb_type[i8] = sub_mb_type; | |
1245 | |
1246 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
1247 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
1248 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref[0], 1); | |
1249 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, ref[1], 1); | |
1250 | |
1251 /* col_zero_flag */ | |
1252 if(!IS_INTRA(mb_type_col) && l1ref0[x8 + y8*h->b8_stride] == 0){ | |
1253 for(i4=0; i4<4; i4++){ | |
1254 const int16_t *mv_col = l1mv0[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; | |
1255 if(ABS(mv_col[0]) <= 1 && ABS(mv_col[1]) <= 1){ | |
1256 if(ref[0] == 0) | |
1257 *(uint32_t*)h->mv_cache[0][scan8[i8*4+i4]] = 0; | |
1258 if(ref[1] == 0) | |
1259 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = 0; | |
1260 } | |
1261 } | |
1262 } | |
1263 } | |
1264 } | |
1265 }else{ /* direct temporal mv pred */ | |
1266 if(IS_16X16(*mb_type)){ | |
1267 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, 0, 1); | |
1268 if(IS_INTRA(mb_type_col)){ | |
1269 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
1270 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
1271 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
1272 }else{ | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1273 const int ref0 = l1ref0[0] >= 0 ? h->map_col_to_list0[0][l1ref0[0]] |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1274 : h->map_col_to_list0[1][l1ref1[0]]; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1275 assert(ref0 >= 0); |
2396 | 1276 const int dist_scale_factor = h->dist_scale_factor[ref0]; |
1277 const int16_t *mv_col = l1mv0[0]; | |
1278 int mv_l0[2]; | |
1279 mv_l0[0] = (dist_scale_factor * mv_col[0] + 128) >> 8; | |
1280 mv_l0[1] = (dist_scale_factor * mv_col[1] + 128) >> 8; | |
1281 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref0, 1); | |
1282 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv_l0[0],mv_l0[1]), 4); | |
1283 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]), 4); | |
1284 } | |
1285 }else{ | |
1286 for(i8=0; i8<4; i8++){ | |
1287 const int x8 = i8&1; | |
1288 const int y8 = i8>>1; | |
1289 int ref0, dist_scale_factor; | |
1290 | |
1291 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
1292 continue; | |
1293 h->sub_mb_type[i8] = sub_mb_type; | |
1294 if(IS_INTRA(mb_type_col)){ | |
1295 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1); | |
1296 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); | |
1297 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1298 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1299 continue; | |
1300 } | |
1301 | |
1302 ref0 = l1ref0[x8 + y8*h->b8_stride]; | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1303 if(ref0 >= 0) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1304 ref0 = h->map_col_to_list0[0][ref0]; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1305 else |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1306 ref0 = h->map_col_to_list0[1][l1ref1[x8 + y8*h->b8_stride]]; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1307 assert(ref0 >= 0); |
2396 | 1308 dist_scale_factor = h->dist_scale_factor[ref0]; |
1309 | |
1310 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1); | |
1311 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); | |
1312 for(i4=0; i4<4; i4++){ | |
1313 const int16_t *mv_col = l1mv0[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; | |
1314 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]]; | |
1315 mv_l0[0] = (dist_scale_factor * mv_col[0] + 128) >> 8; | |
1316 mv_l0[1] = (dist_scale_factor * mv_col[1] + 128) >> 8; | |
1317 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = | |
1318 pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]); | |
1319 } | |
1320 } | |
1321 } | |
1322 } | |
1323 } | |
1324 | |
1168 | 1325 static inline void write_back_motion(H264Context *h, int mb_type){ |
1326 MpegEncContext * const s = &h->s; | |
1327 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
1328 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
1329 int list; | |
1330 | |
1331 for(list=0; list<2; list++){ | |
1332 int y; | |
2535 | 1333 if(!USES_LIST(mb_type, list)){ |
1168 | 1334 if(1){ //FIXME skip or never read if mb_type doesnt use it |
1335 for(y=0; y<4; y++){ | |
1336 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]= | |
1337 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= 0; | |
1338 } | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1339 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
|
1340 /* FIXME needed ? */ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1341 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
|
1342 *(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
|
1343 *(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
|
1344 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1345 } |
1168 | 1346 for(y=0; y<2; y++){ |
2365
b76a4977447a
Fixed typo which caused incorrect motion prediction in B-frames. patch by (Loren Merritt <lorenm ta u tod washington tod edu>)
michael
parents:
2336
diff
changeset
|
1347 *(uint16_t*)&s->current_picture.ref_index[list][b8_xy + y*h->b8_stride]= (LIST_NOT_USED&0xFF)*0x0101; |
1168 | 1348 } |
1349 } | |
2396 | 1350 continue; |
1168 | 1351 } |
1352 | |
1353 for(y=0; y<4; y++){ | |
1354 *(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]; | |
1355 *(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]; | |
1356 } | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1357 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
|
1358 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
|
1359 *(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
|
1360 *(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
|
1361 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1362 } |
1168 | 1363 for(y=0; y<2; y++){ |
1364 s->current_picture.ref_index[list][b8_xy + 0 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+0 + 16*y]; | |
1365 s->current_picture.ref_index[list][b8_xy + 1 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+2 + 16*y]; | |
1366 } | |
1367 } | |
2396 | 1368 |
1369 if(h->slice_type == B_TYPE && h->pps.cabac){ | |
1370 if(IS_8X8(mb_type)){ | |
1371 h->direct_table[b8_xy+1+0*h->b8_stride] = IS_DIRECT(h->sub_mb_type[1]) ? 1 : 0; | |
1372 h->direct_table[b8_xy+0+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[2]) ? 1 : 0; | |
1373 h->direct_table[b8_xy+1+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[3]) ? 1 : 0; | |
1374 } | |
1375 } | |
1168 | 1376 } |
1377 | |
1378 /** | |
1379 * Decodes a network abstraction layer unit. | |
1380 * @param consumed is the number of bytes used as input | |
1381 * @param length is the length of the array | |
1382 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp ttailing? | |
1383 * @returns decoded bytes, might be src+1 if no escapes | |
1384 */ | |
1385 static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *consumed, int length){ | |
1386 int i, si, di; | |
1387 uint8_t *dst; | |
1388 | |
1389 // src[0]&0x80; //forbidden bit | |
1390 h->nal_ref_idc= src[0]>>5; | |
1391 h->nal_unit_type= src[0]&0x1F; | |
1392 | |
1393 src++; length--; | |
1394 #if 0 | |
1395 for(i=0; i<length; i++) | |
1396 printf("%2X ", src[i]); | |
1397 #endif | |
1398 for(i=0; i+1<length; i+=2){ | |
1399 if(src[i]) continue; | |
1400 if(i>0 && src[i-1]==0) i--; | |
1401 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
1402 if(src[i+2]!=3){ | |
1403 /* startcode, so we must be past the end */ | |
1404 length=i; | |
1405 } | |
1406 break; | |
1407 } | |
1408 } | |
1409 | |
1410 if(i>=length-1){ //no escaped 0 | |
1411 *dst_length= length; | |
1412 *consumed= length+1; //+1 for the header | |
1413 return src; | |
1414 } | |
1415 | |
1416 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length); | |
1417 dst= h->rbsp_buffer; | |
1418 | |
1419 //printf("deoding esc\n"); | |
1420 si=di=0; | |
1421 while(si<length){ | |
1422 //remove escapes (very rare 1:2^22) | |
1423 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
1424 if(src[si+2]==3){ //escape | |
1425 dst[di++]= 0; | |
1426 dst[di++]= 0; | |
1427 si+=3; | |
1957
54411768fa38
h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1956
diff
changeset
|
1428 continue; |
1168 | 1429 }else //next start code |
1430 break; | |
1431 } | |
1432 | |
1433 dst[di++]= src[si++]; | |
1434 } | |
1435 | |
1436 *dst_length= di; | |
1437 *consumed= si + 1;//+1 for the header | |
1438 //FIXME store exact number of bits in the getbitcontext (its needed for decoding) | |
1439 return dst; | |
1440 } | |
1441 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1442 #if 0 |
1168 | 1443 /** |
1444 * @param src the data which should be escaped | |
1445 * @param dst the target buffer, dst+1 == src is allowed as a special case | |
1446 * @param length the length of the src data | |
1447 * @param dst_length the length of the dst array | |
1448 * @returns length of escaped data in bytes or -1 if an error occured | |
1449 */ | |
1450 static int encode_nal(H264Context *h, uint8_t *dst, uint8_t *src, int length, int dst_length){ | |
1451 int i, escape_count, si, di; | |
1452 uint8_t *temp; | |
1453 | |
1454 assert(length>=0); | |
1455 assert(dst_length>0); | |
1456 | |
1457 dst[0]= (h->nal_ref_idc<<5) + h->nal_unit_type; | |
1458 | |
1459 if(length==0) return 1; | |
1460 | |
1461 escape_count= 0; | |
1462 for(i=0; i<length; i+=2){ | |
1463 if(src[i]) continue; | |
1464 if(i>0 && src[i-1]==0) | |
1465 i--; | |
1466 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
1467 escape_count++; | |
1468 i+=2; | |
1469 } | |
1470 } | |
1471 | |
1472 if(escape_count==0){ | |
1473 if(dst+1 != src) | |
1474 memcpy(dst+1, src, length); | |
1475 return length + 1; | |
1476 } | |
1477 | |
1478 if(length + escape_count + 1> dst_length) | |
1479 return -1; | |
1480 | |
1481 //this should be damn rare (hopefully) | |
1482 | |
1483 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length + escape_count); | |
1484 temp= h->rbsp_buffer; | |
1485 //printf("encoding esc\n"); | |
1486 | |
1487 si= 0; | |
1488 di= 0; | |
1489 while(si < length){ | |
1490 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
1491 temp[di++]= 0; si++; | |
1492 temp[di++]= 0; si++; | |
1493 temp[di++]= 3; | |
1494 temp[di++]= src[si++]; | |
1495 } | |
1496 else | |
1497 temp[di++]= src[si++]; | |
1498 } | |
1499 memcpy(dst+1, temp, length+escape_count); | |
1500 | |
1501 assert(di == length+escape_count); | |
1502 | |
1503 return di + 1; | |
1504 } | |
1505 | |
1506 /** | |
1507 * write 1,10,100,1000,... for alignment, yes its exactly inverse to mpeg4 | |
1508 */ | |
1509 static void encode_rbsp_trailing(PutBitContext *pb){ | |
1510 int length; | |
1511 put_bits(pb, 1, 1); | |
1786 | 1512 length= (-put_bits_count(pb))&7; |
1168 | 1513 if(length) put_bits(pb, length, 0); |
1514 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1515 #endif |
1168 | 1516 |
1517 /** | |
1518 * identifies the exact end of the bitstream | |
1519 * @return the length of the trailing, or 0 if damaged | |
1520 */ | |
1521 static int decode_rbsp_trailing(uint8_t *src){ | |
1522 int v= *src; | |
1523 int r; | |
1524 | |
1170 | 1525 tprintf("rbsp trailing %X\n", v); |
1168 | 1526 |
1527 for(r=1; r<9; r++){ | |
1528 if(v&1) return r; | |
1529 v>>=1; | |
1530 } | |
1531 return 0; | |
1532 } | |
1533 | |
1534 /** | |
1535 * idct tranforms the 16 dc values and dequantize them. | |
1536 * @param qp quantization parameter | |
1537 */ | |
1538 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
1539 const int qmul= dequant_coeff[qp][0]; | |
1540 #define stride 16 | |
1541 int i; | |
1542 int temp[16]; //FIXME check if this is a good idea | |
1543 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
1544 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
1545 | |
1546 //memset(block, 64, 2*256); | |
1547 //return; | |
1548 for(i=0; i<4; i++){ | |
1549 const int offset= y_offset[i]; | |
1550 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
1551 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
1552 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
1553 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
1554 | |
1555 temp[4*i+0]= z0+z3; | |
1556 temp[4*i+1]= z1+z2; | |
1557 temp[4*i+2]= z1-z2; | |
1558 temp[4*i+3]= z0-z3; | |
1559 } | |
1560 | |
1561 for(i=0; i<4; i++){ | |
1562 const int offset= x_offset[i]; | |
1563 const int z0= temp[4*0+i] + temp[4*2+i]; | |
1564 const int z1= temp[4*0+i] - temp[4*2+i]; | |
1565 const int z2= temp[4*1+i] - temp[4*3+i]; | |
1566 const int z3= temp[4*1+i] + temp[4*3+i]; | |
1567 | |
1568 block[stride*0 +offset]= ((z0 + z3)*qmul + 2)>>2; //FIXME think about merging this into decode_resdual | |
1569 block[stride*2 +offset]= ((z1 + z2)*qmul + 2)>>2; | |
1570 block[stride*8 +offset]= ((z1 - z2)*qmul + 2)>>2; | |
1571 block[stride*10+offset]= ((z0 - z3)*qmul + 2)>>2; | |
1572 } | |
1573 } | |
1574 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1575 #if 0 |
1168 | 1576 /** |
1577 * dct tranforms the 16 dc values. | |
1578 * @param qp quantization parameter ??? FIXME | |
1579 */ | |
1580 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){ | |
1581 // const int qmul= dequant_coeff[qp][0]; | |
1582 int i; | |
1583 int temp[16]; //FIXME check if this is a good idea | |
1584 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
1585 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
1586 | |
1587 for(i=0; i<4; i++){ | |
1588 const int offset= y_offset[i]; | |
1589 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
1590 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
1591 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
1592 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
1593 | |
1594 temp[4*i+0]= z0+z3; | |
1595 temp[4*i+1]= z1+z2; | |
1596 temp[4*i+2]= z1-z2; | |
1597 temp[4*i+3]= z0-z3; | |
1598 } | |
1599 | |
1600 for(i=0; i<4; i++){ | |
1601 const int offset= x_offset[i]; | |
1602 const int z0= temp[4*0+i] + temp[4*2+i]; | |
1603 const int z1= temp[4*0+i] - temp[4*2+i]; | |
1604 const int z2= temp[4*1+i] - temp[4*3+i]; | |
1605 const int z3= temp[4*1+i] + temp[4*3+i]; | |
1606 | |
1607 block[stride*0 +offset]= (z0 + z3)>>1; | |
1608 block[stride*2 +offset]= (z1 + z2)>>1; | |
1609 block[stride*8 +offset]= (z1 - z2)>>1; | |
1610 block[stride*10+offset]= (z0 - z3)>>1; | |
1611 } | |
1612 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1613 #endif |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1614 |
1168 | 1615 #undef xStride |
1616 #undef stride | |
1617 | |
1618 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
1619 const int qmul= dequant_coeff[qp][0]; | |
1620 const int stride= 16*2; | |
1621 const int xStride= 16; | |
1622 int a,b,c,d,e; | |
1623 | |
1624 a= block[stride*0 + xStride*0]; | |
1625 b= block[stride*0 + xStride*1]; | |
1626 c= block[stride*1 + xStride*0]; | |
1627 d= block[stride*1 + xStride*1]; | |
1628 | |
1629 e= a-b; | |
1630 a= a+b; | |
1631 b= c-d; | |
1632 c= c+d; | |
1633 | |
1634 block[stride*0 + xStride*0]= ((a+c)*qmul + 0)>>1; | |
1635 block[stride*0 + xStride*1]= ((e+b)*qmul + 0)>>1; | |
1636 block[stride*1 + xStride*0]= ((a-c)*qmul + 0)>>1; | |
1637 block[stride*1 + xStride*1]= ((e-b)*qmul + 0)>>1; | |
1638 } | |
1639 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1640 #if 0 |
1168 | 1641 static void chroma_dc_dct_c(DCTELEM *block){ |
1642 const int stride= 16*2; | |
1643 const int xStride= 16; | |
1644 int a,b,c,d,e; | |
1645 | |
1646 a= block[stride*0 + xStride*0]; | |
1647 b= block[stride*0 + xStride*1]; | |
1648 c= block[stride*1 + xStride*0]; | |
1649 d= block[stride*1 + xStride*1]; | |
1650 | |
1651 e= a-b; | |
1652 a= a+b; | |
1653 b= c-d; | |
1654 c= c+d; | |
1655 | |
1656 block[stride*0 + xStride*0]= (a+c); | |
1657 block[stride*0 + xStride*1]= (e+b); | |
1658 block[stride*1 + xStride*0]= (a-c); | |
1659 block[stride*1 + xStride*1]= (e-b); | |
1660 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1661 #endif |
1168 | 1662 |
1663 /** | |
1664 * gets the chroma qp. | |
1665 */ | |
1666 static inline int get_chroma_qp(H264Context *h, int qscale){ | |
1667 | |
1668 return chroma_qp[clip(qscale + h->pps.chroma_qp_index_offset, 0, 51)]; | |
1669 } | |
1670 | |
1671 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1672 #if 0 |
1168 | 1673 static void h264_diff_dct_c(DCTELEM *block, uint8_t *src1, uint8_t *src2, int stride){ |
1674 int i; | |
1675 //FIXME try int temp instead of block | |
1676 | |
1677 for(i=0; i<4; i++){ | |
1678 const int d0= src1[0 + i*stride] - src2[0 + i*stride]; | |
1679 const int d1= src1[1 + i*stride] - src2[1 + i*stride]; | |
1680 const int d2= src1[2 + i*stride] - src2[2 + i*stride]; | |
1681 const int d3= src1[3 + i*stride] - src2[3 + i*stride]; | |
1682 const int z0= d0 + d3; | |
1683 const int z3= d0 - d3; | |
1684 const int z1= d1 + d2; | |
1685 const int z2= d1 - d2; | |
1686 | |
1687 block[0 + 4*i]= z0 + z1; | |
1688 block[1 + 4*i]= 2*z3 + z2; | |
1689 block[2 + 4*i]= z0 - z1; | |
1690 block[3 + 4*i]= z3 - 2*z2; | |
1691 } | |
1692 | |
1693 for(i=0; i<4; i++){ | |
1694 const int z0= block[0*4 + i] + block[3*4 + i]; | |
1695 const int z3= block[0*4 + i] - block[3*4 + i]; | |
1696 const int z1= block[1*4 + i] + block[2*4 + i]; | |
1697 const int z2= block[1*4 + i] - block[2*4 + i]; | |
1698 | |
1699 block[0*4 + i]= z0 + z1; | |
1700 block[1*4 + i]= 2*z3 + z2; | |
1701 block[2*4 + i]= z0 - z1; | |
1702 block[3*4 + i]= z3 - 2*z2; | |
1703 } | |
1704 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1705 #endif |
1168 | 1706 |
1707 //FIXME need to check that this doesnt overflow signed 32 bit for low qp, iam not sure, its very close | |
1708 //FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away) | |
1709 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int seperate_dc){ | |
1710 int i; | |
1711 const int * const quant_table= quant_coeff[qscale]; | |
1712 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6; | |
1713 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1; | |
1714 const unsigned int threshold2= (threshold1<<1); | |
1715 int last_non_zero; | |
1716 | |
1717 if(seperate_dc){ | |
1718 if(qscale<=18){ | |
1719 //avoid overflows | |
1720 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6; | |
1721 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1; | |
1722 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
1723 | |
1724 int level= block[0]*quant_coeff[qscale+18][0]; | |
1725 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
1726 if(level>0){ | |
1727 level= (dc_bias + level)>>(QUANT_SHIFT-2); | |
1728 block[0]= level; | |
1729 }else{ | |
1730 level= (dc_bias - level)>>(QUANT_SHIFT-2); | |
1731 block[0]= -level; | |
1732 } | |
1733 // last_non_zero = i; | |
1734 }else{ | |
1735 block[0]=0; | |
1736 } | |
1737 }else{ | |
1738 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6; | |
1739 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1; | |
1740 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
1741 | |
1742 int level= block[0]*quant_table[0]; | |
1743 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
1744 if(level>0){ | |
1745 level= (dc_bias + level)>>(QUANT_SHIFT+1); | |
1746 block[0]= level; | |
1747 }else{ | |
1748 level= (dc_bias - level)>>(QUANT_SHIFT+1); | |
1749 block[0]= -level; | |
1750 } | |
1751 // last_non_zero = i; | |
1752 }else{ | |
1753 block[0]=0; | |
1754 } | |
1755 } | |
1756 last_non_zero= 0; | |
1757 i=1; | |
1758 }else{ | |
1759 last_non_zero= -1; | |
1760 i=0; | |
1761 } | |
1762 | |
1763 for(; i<16; i++){ | |
1764 const int j= scantable[i]; | |
1765 int level= block[j]*quant_table[j]; | |
1766 | |
1767 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
1768 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
1769 if(((unsigned)(level+threshold1))>threshold2){ | |
1770 if(level>0){ | |
1771 level= (bias + level)>>QUANT_SHIFT; | |
1772 block[j]= level; | |
1773 }else{ | |
1774 level= (bias - level)>>QUANT_SHIFT; | |
1775 block[j]= -level; | |
1776 } | |
1777 last_non_zero = i; | |
1778 }else{ | |
1779 block[j]=0; | |
1780 } | |
1781 } | |
1782 | |
1783 return last_non_zero; | |
1784 } | |
1785 | |
1786 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){ | |
1787 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
1788 ((uint32_t*)(src+0*stride))[0]= a; | |
1789 ((uint32_t*)(src+1*stride))[0]= a; | |
1790 ((uint32_t*)(src+2*stride))[0]= a; | |
1791 ((uint32_t*)(src+3*stride))[0]= a; | |
1792 } | |
1793 | |
1794 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){ | |
1795 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101; | |
1796 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101; | |
1797 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101; | |
1798 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101; | |
1799 } | |
1800 | |
1801 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
1802 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] | |
1803 + src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 4) >>3; | |
1804 | |
1805 ((uint32_t*)(src+0*stride))[0]= | |
1806 ((uint32_t*)(src+1*stride))[0]= | |
1807 ((uint32_t*)(src+2*stride))[0]= | |
1808 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
1809 } | |
1810 | |
1811 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
1812 const int dc= ( src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 2) >>2; | |
1813 | |
1814 ((uint32_t*)(src+0*stride))[0]= | |
1815 ((uint32_t*)(src+1*stride))[0]= | |
1816 ((uint32_t*)(src+2*stride))[0]= | |
1817 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
1818 } | |
1819 | |
1820 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
1821 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2; | |
1822 | |
1823 ((uint32_t*)(src+0*stride))[0]= | |
1824 ((uint32_t*)(src+1*stride))[0]= | |
1825 ((uint32_t*)(src+2*stride))[0]= | |
1826 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
1827 } | |
1828 | |
1829 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
1830 ((uint32_t*)(src+0*stride))[0]= | |
1831 ((uint32_t*)(src+1*stride))[0]= | |
1832 ((uint32_t*)(src+2*stride))[0]= | |
1833 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U; | |
1834 } | |
1835 | |
1836 | |
1837 #define LOAD_TOP_RIGHT_EDGE\ | |
1838 const int t4= topright[0];\ | |
1839 const int t5= topright[1];\ | |
1840 const int t6= topright[2];\ | |
1841 const int t7= topright[3];\ | |
1842 | |
1843 #define LOAD_LEFT_EDGE\ | |
1844 const int l0= src[-1+0*stride];\ | |
1845 const int l1= src[-1+1*stride];\ | |
1846 const int l2= src[-1+2*stride];\ | |
1847 const int l3= src[-1+3*stride];\ | |
1848 | |
1849 #define LOAD_TOP_EDGE\ | |
1850 const int t0= src[ 0-1*stride];\ | |
1851 const int t1= src[ 1-1*stride];\ | |
1852 const int t2= src[ 2-1*stride];\ | |
1853 const int t3= src[ 3-1*stride];\ | |
1854 | |
1855 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
1856 const int lt= src[-1-1*stride]; | |
1857 LOAD_TOP_EDGE | |
1858 LOAD_LEFT_EDGE | |
1859 | |
1860 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2; | |
1861 src[0+2*stride]= | |
1862 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2; | |
1863 src[0+1*stride]= | |
1864 src[1+2*stride]= | |
1865 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2; | |
1866 src[0+0*stride]= | |
1867 src[1+1*stride]= | |
1868 src[2+2*stride]= | |
1869 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
1870 src[1+0*stride]= | |
1871 src[2+1*stride]= | |
1872 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
1873 src[2+0*stride]= | |
1874 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
1875 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
1282 | 1876 } |
1168 | 1877 |
1878 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
1879 LOAD_TOP_EDGE | |
1880 LOAD_TOP_RIGHT_EDGE | |
1881 // LOAD_LEFT_EDGE | |
1882 | |
1883 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2; | |
1884 src[1+0*stride]= | |
1885 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2; | |
1886 src[2+0*stride]= | |
1887 src[1+1*stride]= | |
1888 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2; | |
1889 src[3+0*stride]= | |
1890 src[2+1*stride]= | |
1891 src[1+2*stride]= | |
1892 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2; | |
1893 src[3+1*stride]= | |
1894 src[2+2*stride]= | |
1895 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2; | |
1896 src[3+2*stride]= | |
1897 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2; | |
1898 src[3+3*stride]=(t6 + 3*t7 + 2)>>2; | |
1282 | 1899 } |
1168 | 1900 |
1901 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
1902 const int lt= src[-1-1*stride]; | |
1903 LOAD_TOP_EDGE | |
1904 LOAD_LEFT_EDGE | |
1905 const __attribute__((unused)) int unu= l3; | |
1906 | |
1907 src[0+0*stride]= | |
1908 src[1+2*stride]=(lt + t0 + 1)>>1; | |
1909 src[1+0*stride]= | |
1910 src[2+2*stride]=(t0 + t1 + 1)>>1; | |
1911 src[2+0*stride]= | |
1912 src[3+2*stride]=(t1 + t2 + 1)>>1; | |
1913 src[3+0*stride]=(t2 + t3 + 1)>>1; | |
1914 src[0+1*stride]= | |
1915 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
1916 src[1+1*stride]= | |
1917 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
1918 src[2+1*stride]= | |
1919 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
1920 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
1921 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
1922 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
1282 | 1923 } |
1168 | 1924 |
1925 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
1926 LOAD_TOP_EDGE | |
1927 LOAD_TOP_RIGHT_EDGE | |
1928 const __attribute__((unused)) int unu= t7; | |
1929 | |
1930 src[0+0*stride]=(t0 + t1 + 1)>>1; | |
1931 src[1+0*stride]= | |
1932 src[0+2*stride]=(t1 + t2 + 1)>>1; | |
1933 src[2+0*stride]= | |
1934 src[1+2*stride]=(t2 + t3 + 1)>>1; | |
1935 src[3+0*stride]= | |
1936 src[2+2*stride]=(t3 + t4+ 1)>>1; | |
1937 src[3+2*stride]=(t4 + t5+ 1)>>1; | |
1938 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
1939 src[1+1*stride]= | |
1940 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
1941 src[2+1*stride]= | |
1942 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2; | |
1943 src[3+1*stride]= | |
1944 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; | |
1945 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; | |
1282 | 1946 } |
1168 | 1947 |
1948 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ | |
1949 LOAD_LEFT_EDGE | |
1950 | |
1951 src[0+0*stride]=(l0 + l1 + 1)>>1; | |
1952 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
1953 src[2+0*stride]= | |
1954 src[0+1*stride]=(l1 + l2 + 1)>>1; | |
1955 src[3+0*stride]= | |
1956 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
1957 src[2+1*stride]= | |
1958 src[0+2*stride]=(l2 + l3 + 1)>>1; | |
1959 src[3+1*stride]= | |
1960 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2; | |
1961 src[3+2*stride]= | |
1962 src[1+3*stride]= | |
1963 src[0+3*stride]= | |
1964 src[2+2*stride]= | |
1965 src[2+3*stride]= | |
1966 src[3+3*stride]=l3; | |
1282 | 1967 } |
1168 | 1968 |
1969 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){ | |
1970 const int lt= src[-1-1*stride]; | |
1971 LOAD_TOP_EDGE | |
1972 LOAD_LEFT_EDGE | |
1973 const __attribute__((unused)) int unu= t3; | |
1974 | |
1975 src[0+0*stride]= | |
1976 src[2+1*stride]=(lt + l0 + 1)>>1; | |
1977 src[1+0*stride]= | |
1978 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
1979 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
1980 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
1981 src[0+1*stride]= | |
1982 src[2+2*stride]=(l0 + l1 + 1)>>1; | |
1983 src[1+1*stride]= | |
1984 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
1985 src[0+2*stride]= | |
1986 src[2+3*stride]=(l1 + l2+ 1)>>1; | |
1987 src[1+2*stride]= | |
1988 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
1989 src[0+3*stride]=(l2 + l3 + 1)>>1; | |
1990 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
1282 | 1991 } |
1168 | 1992 |
1993 static void pred16x16_vertical_c(uint8_t *src, int stride){ | |
1994 int i; | |
1995 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
1996 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
1997 const uint32_t c= ((uint32_t*)(src-stride))[2]; | |
1998 const uint32_t d= ((uint32_t*)(src-stride))[3]; | |
1999 | |
2000 for(i=0; i<16; i++){ | |
2001 ((uint32_t*)(src+i*stride))[0]= a; | |
2002 ((uint32_t*)(src+i*stride))[1]= b; | |
2003 ((uint32_t*)(src+i*stride))[2]= c; | |
2004 ((uint32_t*)(src+i*stride))[3]= d; | |
2005 } | |
2006 } | |
2007 | |
2008 static void pred16x16_horizontal_c(uint8_t *src, int stride){ | |
2009 int i; | |
2010 | |
2011 for(i=0; i<16; i++){ | |
2012 ((uint32_t*)(src+i*stride))[0]= | |
2013 ((uint32_t*)(src+i*stride))[1]= | |
2014 ((uint32_t*)(src+i*stride))[2]= | |
2015 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101; | |
2016 } | |
2017 } | |
2018 | |
2019 static void pred16x16_dc_c(uint8_t *src, int stride){ | |
2020 int i, dc=0; | |
2021 | |
2022 for(i=0;i<16; i++){ | |
2023 dc+= src[-1+i*stride]; | |
2024 } | |
2025 | |
2026 for(i=0;i<16; i++){ | |
2027 dc+= src[i-stride]; | |
2028 } | |
2029 | |
2030 dc= 0x01010101*((dc + 16)>>5); | |
2031 | |
2032 for(i=0; i<16; i++){ | |
2033 ((uint32_t*)(src+i*stride))[0]= | |
2034 ((uint32_t*)(src+i*stride))[1]= | |
2035 ((uint32_t*)(src+i*stride))[2]= | |
2036 ((uint32_t*)(src+i*stride))[3]= dc; | |
2037 } | |
2038 } | |
2039 | |
2040 static void pred16x16_left_dc_c(uint8_t *src, int stride){ | |
2041 int i, dc=0; | |
2042 | |
2043 for(i=0;i<16; i++){ | |
2044 dc+= src[-1+i*stride]; | |
2045 } | |
2046 | |
2047 dc= 0x01010101*((dc + 8)>>4); | |
2048 | |
2049 for(i=0; i<16; i++){ | |
2050 ((uint32_t*)(src+i*stride))[0]= | |
2051 ((uint32_t*)(src+i*stride))[1]= | |
2052 ((uint32_t*)(src+i*stride))[2]= | |
2053 ((uint32_t*)(src+i*stride))[3]= dc; | |
2054 } | |
2055 } | |
2056 | |
2057 static void pred16x16_top_dc_c(uint8_t *src, int stride){ | |
2058 int i, dc=0; | |
2059 | |
2060 for(i=0;i<16; i++){ | |
2061 dc+= src[i-stride]; | |
2062 } | |
2063 dc= 0x01010101*((dc + 8)>>4); | |
2064 | |
2065 for(i=0; i<16; i++){ | |
2066 ((uint32_t*)(src+i*stride))[0]= | |
2067 ((uint32_t*)(src+i*stride))[1]= | |
2068 ((uint32_t*)(src+i*stride))[2]= | |
2069 ((uint32_t*)(src+i*stride))[3]= dc; | |
2070 } | |
2071 } | |
2072 | |
2073 static void pred16x16_128_dc_c(uint8_t *src, int stride){ | |
2074 int i; | |
2075 | |
2076 for(i=0; i<16; i++){ | |
2077 ((uint32_t*)(src+i*stride))[0]= | |
2078 ((uint32_t*)(src+i*stride))[1]= | |
2079 ((uint32_t*)(src+i*stride))[2]= | |
2080 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U; | |
2081 } | |
2082 } | |
2083 | |
1234 | 2084 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
|
2085 int i, j, k; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2086 int a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2087 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
|
2088 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
|
2089 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
|
2090 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
|
2091 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
|
2092 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
|
2093 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
|
2094 src1 += stride; src2 -= stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2095 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
|
2096 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
|
2097 } |
1234 | 2098 if(svq3){ |
2099 H = ( 5*(H/4) ) / 16; | |
2100 V = ( 5*(V/4) ) / 16; | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2101 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2102 /* required for 100% accuracy */ |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2103 i = H; H = V; V = i; |
1234 | 2104 }else{ |
2105 H = ( 5*H+32 ) >> 6; | |
2106 V = ( 5*V+32 ) >> 6; | |
2107 } | |
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2108 |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2109 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
|
2110 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
|
2111 int b = a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2112 a += V; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2113 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
|
2114 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
|
2115 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
|
2116 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
|
2117 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
|
2118 b += 4*H; |
1168 | 2119 } |
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2120 src += stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2121 } |
1168 | 2122 } |
2123 | |
1234 | 2124 static void pred16x16_plane_c(uint8_t *src, int stride){ |
2125 pred16x16_plane_compat_c(src, stride, 0); | |
2126 } | |
2127 | |
1168 | 2128 static void pred8x8_vertical_c(uint8_t *src, int stride){ |
2129 int i; | |
2130 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
2131 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
2132 | |
2133 for(i=0; i<8; i++){ | |
2134 ((uint32_t*)(src+i*stride))[0]= a; | |
2135 ((uint32_t*)(src+i*stride))[1]= b; | |
2136 } | |
2137 } | |
2138 | |
2139 static void pred8x8_horizontal_c(uint8_t *src, int stride){ | |
2140 int i; | |
2141 | |
2142 for(i=0; i<8; i++){ | |
2143 ((uint32_t*)(src+i*stride))[0]= | |
2144 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101; | |
2145 } | |
2146 } | |
2147 | |
2148 static void pred8x8_128_dc_c(uint8_t *src, int stride){ | |
2149 int i; | |
2150 | |
2151 for(i=0; i<4; i++){ | |
2152 ((uint32_t*)(src+i*stride))[0]= | |
2153 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; | |
2154 } | |
2155 for(i=4; i<8; i++){ | |
2156 ((uint32_t*)(src+i*stride))[0]= | |
2157 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; | |
2158 } | |
2159 } | |
2160 | |
2161 static void pred8x8_left_dc_c(uint8_t *src, int stride){ | |
2162 int i; | |
2163 int dc0, dc2; | |
2164 | |
2165 dc0=dc2=0; | |
2166 for(i=0;i<4; i++){ | |
2167 dc0+= src[-1+i*stride]; | |
2168 dc2+= src[-1+(i+4)*stride]; | |
2169 } | |
2170 dc0= 0x01010101*((dc0 + 2)>>2); | |
2171 dc2= 0x01010101*((dc2 + 2)>>2); | |
2172 | |
2173 for(i=0; i<4; i++){ | |
2174 ((uint32_t*)(src+i*stride))[0]= | |
2175 ((uint32_t*)(src+i*stride))[1]= dc0; | |
2176 } | |
2177 for(i=4; i<8; i++){ | |
2178 ((uint32_t*)(src+i*stride))[0]= | |
2179 ((uint32_t*)(src+i*stride))[1]= dc2; | |
2180 } | |
2181 } | |
2182 | |
2183 static void pred8x8_top_dc_c(uint8_t *src, int stride){ | |
2184 int i; | |
2185 int dc0, dc1; | |
2186 | |
2187 dc0=dc1=0; | |
2188 for(i=0;i<4; i++){ | |
2189 dc0+= src[i-stride]; | |
2190 dc1+= src[4+i-stride]; | |
2191 } | |
2192 dc0= 0x01010101*((dc0 + 2)>>2); | |
2193 dc1= 0x01010101*((dc1 + 2)>>2); | |
2194 | |
2195 for(i=0; i<4; i++){ | |
2196 ((uint32_t*)(src+i*stride))[0]= dc0; | |
2197 ((uint32_t*)(src+i*stride))[1]= dc1; | |
2198 } | |
2199 for(i=4; i<8; i++){ | |
2200 ((uint32_t*)(src+i*stride))[0]= dc0; | |
2201 ((uint32_t*)(src+i*stride))[1]= dc1; | |
2202 } | |
2203 } | |
2204 | |
2205 | |
2206 static void pred8x8_dc_c(uint8_t *src, int stride){ | |
2207 int i; | |
2208 int dc0, dc1, dc2, dc3; | |
2209 | |
2210 dc0=dc1=dc2=0; | |
2211 for(i=0;i<4; i++){ | |
2212 dc0+= src[-1+i*stride] + src[i-stride]; | |
2213 dc1+= src[4+i-stride]; | |
2214 dc2+= src[-1+(i+4)*stride]; | |
2215 } | |
2216 dc3= 0x01010101*((dc1 + dc2 + 4)>>3); | |
2217 dc0= 0x01010101*((dc0 + 4)>>3); | |
2218 dc1= 0x01010101*((dc1 + 2)>>2); | |
2219 dc2= 0x01010101*((dc2 + 2)>>2); | |
2220 | |
2221 for(i=0; i<4; i++){ | |
2222 ((uint32_t*)(src+i*stride))[0]= dc0; | |
2223 ((uint32_t*)(src+i*stride))[1]= dc1; | |
2224 } | |
2225 for(i=4; i<8; i++){ | |
2226 ((uint32_t*)(src+i*stride))[0]= dc2; | |
2227 ((uint32_t*)(src+i*stride))[1]= dc3; | |
2228 } | |
2229 } | |
2230 | |
2231 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
|
2232 int j, k; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2233 int a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2234 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
|
2235 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
|
2236 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
|
2237 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
|
2238 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
|
2239 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
|
2240 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
|
2241 src1 += stride; src2 -= stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2242 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
|
2243 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
|
2244 } |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2245 H = ( 17*H+16 ) >> 5; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2246 V = ( 17*V+16 ) >> 5; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2247 |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2248 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
|
2249 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
|
2250 int b = a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2251 a += V; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2252 src[0] = cm[ (b ) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2253 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
|
2254 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
|
2255 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
|
2256 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
|
2257 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
|
2258 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
|
2259 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
|
2260 src += stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2261 } |
1168 | 2262 } |
2263 | |
2264 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list, | |
2265 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
2266 int src_x_offset, int src_y_offset, | |
2267 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){ | |
2268 MpegEncContext * const s = &h->s; | |
2269 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8; | |
2270 const int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8; | |
2271 const int luma_xy= (mx&3) + ((my&3)<<2); | |
2272 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*s->linesize; | |
2273 uint8_t * src_cb= pic->data[1] + (mx>>3) + (my>>3)*s->uvlinesize; | |
2274 uint8_t * src_cr= pic->data[2] + (mx>>3) + (my>>3)*s->uvlinesize; | |
2275 int extra_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; //FIXME increase edge?, IMHO not worth it | |
2276 int extra_height= extra_width; | |
2277 int emu=0; | |
2278 const int full_mx= mx>>2; | |
2279 const int full_my= my>>2; | |
2280 | |
2281 assert(pic->data[0]); | |
2282 | |
2283 if(mx&7) extra_width -= 3; | |
2284 if(my&7) extra_height -= 3; | |
2285 | |
2286 if( full_mx < 0-extra_width | |
2287 || full_my < 0-extra_height | |
2288 || full_mx + 16/*FIXME*/ > s->width + extra_width | |
2289 || full_my + 16/*FIXME*/ > s->height + extra_height){ | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
2290 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 | 2291 src_y= s->edge_emu_buffer + 2 + 2*s->linesize; |
2292 emu=1; | |
2293 } | |
2294 | |
2295 qpix_op[luma_xy](dest_y, src_y, s->linesize); //FIXME try variable height perhaps? | |
2296 if(!square){ | |
2297 qpix_op[luma_xy](dest_y + delta, src_y + delta, s->linesize); | |
2298 } | |
2299 | |
2300 if(s->flags&CODEC_FLAG_GRAY) return; | |
2301 | |
2302 if(emu){ | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
2303 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 | 2304 src_cb= s->edge_emu_buffer; |
2305 } | |
2306 chroma_op(dest_cb, src_cb, s->uvlinesize, chroma_height, mx&7, my&7); | |
2307 | |
2308 if(emu){ | |
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
2309 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 | 2310 src_cr= s->edge_emu_buffer; |
2311 } | |
2312 chroma_op(dest_cr, src_cr, s->uvlinesize, chroma_height, mx&7, my&7); | |
2313 } | |
2314 | |
2415 | 2315 static inline void mc_part_std(H264Context *h, int n, int square, int chroma_height, int delta, |
1168 | 2316 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
2317 int x_offset, int y_offset, | |
2318 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
2319 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
2320 int list0, int list1){ | |
2321 MpegEncContext * const s = &h->s; | |
2322 qpel_mc_func *qpix_op= qpix_put; | |
2323 h264_chroma_mc_func chroma_op= chroma_put; | |
2324 | |
2325 dest_y += 2*x_offset + 2*y_offset*s-> linesize; | |
2326 dest_cb += x_offset + y_offset*s->uvlinesize; | |
2327 dest_cr += x_offset + y_offset*s->uvlinesize; | |
2328 x_offset += 8*s->mb_x; | |
2329 y_offset += 8*s->mb_y; | |
2330 | |
2331 if(list0){ | |
1169 | 2332 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ]; |
1168 | 2333 mc_dir_part(h, ref, n, square, chroma_height, delta, 0, |
2334 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2335 qpix_op, chroma_op); | |
2336 | |
2337 qpix_op= qpix_avg; | |
2338 chroma_op= chroma_avg; | |
2339 } | |
2340 | |
2341 if(list1){ | |
1169 | 2342 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ]; |
1168 | 2343 mc_dir_part(h, ref, n, square, chroma_height, delta, 1, |
2344 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2345 qpix_op, chroma_op); | |
2346 } | |
2347 } | |
2348 | |
2415 | 2349 static inline void mc_part_weighted(H264Context *h, int n, int square, int chroma_height, int delta, |
2350 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
2351 int x_offset, int y_offset, | |
2352 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
2353 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op, | |
2354 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg, | |
2355 int list0, int list1){ | |
2356 MpegEncContext * const s = &h->s; | |
2357 | |
2358 dest_y += 2*x_offset + 2*y_offset*s-> linesize; | |
2359 dest_cb += x_offset + y_offset*s->uvlinesize; | |
2360 dest_cr += x_offset + y_offset*s->uvlinesize; | |
2361 x_offset += 8*s->mb_x; | |
2362 y_offset += 8*s->mb_y; | |
2363 | |
2364 if(list0 && list1){ | |
2365 /* don't optimize for luma-only case, since B-frames usually | |
2366 * use implicit weights => chroma too. */ | |
2367 uint8_t *tmp_cb = s->obmc_scratchpad; | |
2368 uint8_t *tmp_cr = tmp_cb + 8*s->uvlinesize; | |
2369 uint8_t *tmp_y = tmp_cr + 8*s->uvlinesize; | |
2370 int refn0 = h->ref_cache[0][ scan8[n] ]; | |
2371 int refn1 = h->ref_cache[1][ scan8[n] ]; | |
2372 | |
2373 mc_dir_part(h, &h->ref_list[0][refn0], n, square, chroma_height, delta, 0, | |
2374 dest_y, dest_cb, dest_cr, | |
2375 x_offset, y_offset, qpix_put, chroma_put); | |
2376 mc_dir_part(h, &h->ref_list[1][refn1], n, square, chroma_height, delta, 1, | |
2377 tmp_y, tmp_cb, tmp_cr, | |
2378 x_offset, y_offset, qpix_put, chroma_put); | |
2379 | |
2380 if(h->use_weight == 2){ | |
2381 int weight0 = h->implicit_weight[refn0][refn1]; | |
2382 int weight1 = 64 - weight0; | |
2383 luma_weight_avg( dest_y, tmp_y, s-> linesize, 5, weight0, weight1, 0, 0); | |
2384 chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, 5, weight0, weight1, 0, 0); | |
2385 chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, 5, weight0, weight1, 0, 0); | |
2386 }else{ | |
2387 luma_weight_avg(dest_y, tmp_y, s->linesize, h->luma_log2_weight_denom, | |
2388 h->luma_weight[0][refn0], h->luma_weight[1][refn1], | |
2389 h->luma_offset[0][refn0], h->luma_offset[1][refn1]); | |
2390 chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, h->chroma_log2_weight_denom, | |
2391 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0], | |
2392 h->chroma_offset[0][refn0][0], h->chroma_offset[1][refn1][0]); | |
2393 chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, h->chroma_log2_weight_denom, | |
2394 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1], | |
2395 h->chroma_offset[0][refn0][1], h->chroma_offset[1][refn1][1]); | |
2396 } | |
2397 }else{ | |
2398 int list = list1 ? 1 : 0; | |
2399 int refn = h->ref_cache[list][ scan8[n] ]; | |
2400 Picture *ref= &h->ref_list[list][refn]; | |
2401 mc_dir_part(h, ref, n, square, chroma_height, delta, list, | |
2402 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2403 qpix_put, chroma_put); | |
2404 | |
2405 luma_weight_op(dest_y, s->linesize, h->luma_log2_weight_denom, | |
2406 h->luma_weight[list][refn], h->luma_offset[list][refn]); | |
2407 if(h->use_weight_chroma){ | |
2408 chroma_weight_op(dest_cb, s->uvlinesize, h->chroma_log2_weight_denom, | |
2409 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]); | |
2410 chroma_weight_op(dest_cr, s->uvlinesize, h->chroma_log2_weight_denom, | |
2411 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]); | |
2412 } | |
2413 } | |
2414 } | |
2415 | |
2416 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta, | |
2417 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
2418 int x_offset, int y_offset, | |
2419 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
2420 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
2421 h264_weight_func *weight_op, h264_biweight_func *weight_avg, | |
2422 int list0, int list1){ | |
2423 if((h->use_weight==2 && list0 && list1 | |
2424 && (h->implicit_weight[ h->ref_cache[0][scan8[n]] ][ h->ref_cache[1][scan8[n]] ] != 32)) | |
2425 || h->use_weight==1) | |
2426 mc_part_weighted(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
2427 x_offset, y_offset, qpix_put, chroma_put, | |
2428 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1); | |
2429 else | |
2430 mc_part_std(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
2431 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1); | |
2432 } | |
2433 | |
1168 | 2434 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
2435 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put), | |
2415 | 2436 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg), |
2437 h264_weight_func *weight_op, h264_biweight_func *weight_avg){ | |
1168 | 2438 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
|
2439 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 2440 const int mb_type= s->current_picture.mb_type[mb_xy]; |
2441 | |
2442 assert(IS_INTER(mb_type)); | |
2443 | |
2444 if(IS_16X16(mb_type)){ | |
2445 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0, | |
2446 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0], | |
2415 | 2447 &weight_op[0], &weight_avg[0], |
1168 | 2448 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
2449 }else if(IS_16X8(mb_type)){ | |
2450 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0, | |
2451 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
2415 | 2452 &weight_op[1], &weight_avg[1], |
1168 | 2453 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
2454 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4, | |
2455 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
2415 | 2456 &weight_op[1], &weight_avg[1], |
1168 | 2457 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
2458 }else if(IS_8X16(mb_type)){ | |
2459 mc_part(h, 0, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 0, 0, | |
2460 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
2415 | 2461 &weight_op[2], &weight_avg[2], |
1168 | 2462 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
2463 mc_part(h, 4, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 4, 0, | |
2464 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
2415 | 2465 &weight_op[2], &weight_avg[2], |
1168 | 2466 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
2467 }else{ | |
2468 int i; | |
2469 | |
2470 assert(IS_8X8(mb_type)); | |
2471 | |
2472 for(i=0; i<4; i++){ | |
2473 const int sub_mb_type= h->sub_mb_type[i]; | |
2474 const int n= 4*i; | |
2475 int x_offset= (i&1)<<2; | |
2476 int y_offset= (i&2)<<1; | |
2477 | |
2478 if(IS_SUB_8X8(sub_mb_type)){ | |
2479 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2480 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
2415 | 2481 &weight_op[3], &weight_avg[3], |
1168 | 2482 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
2483 }else if(IS_SUB_8X4(sub_mb_type)){ | |
2484 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2485 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
2415 | 2486 &weight_op[4], &weight_avg[4], |
1168 | 2487 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
2488 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2, | |
2489 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
2415 | 2490 &weight_op[4], &weight_avg[4], |
1168 | 2491 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
2492 }else if(IS_SUB_4X8(sub_mb_type)){ | |
2493 mc_part(h, n , 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2494 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
2415 | 2495 &weight_op[5], &weight_avg[5], |
1168 | 2496 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
2497 mc_part(h, n+1, 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset, | |
2498 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
2415 | 2499 &weight_op[5], &weight_avg[5], |
1168 | 2500 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
2501 }else{ | |
2502 int j; | |
2503 assert(IS_SUB_4X4(sub_mb_type)); | |
2504 for(j=0; j<4; j++){ | |
2505 int sub_x_offset= x_offset + 2*(j&1); | |
2506 int sub_y_offset= y_offset + (j&2); | |
2507 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset, | |
2508 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
2415 | 2509 &weight_op[6], &weight_avg[6], |
1168 | 2510 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
2511 } | |
2512 } | |
2513 } | |
2514 } | |
2515 } | |
2516 | |
2517 static void decode_init_vlc(H264Context *h){ | |
2518 static int done = 0; | |
2519 | |
2520 if (!done) { | |
2521 int i; | |
2522 done = 1; | |
2523 | |
2524 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5, | |
2525 &chroma_dc_coeff_token_len [0], 1, 1, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2526 &chroma_dc_coeff_token_bits[0], 1, 1, 1); |
1168 | 2527 |
2528 for(i=0; i<4; i++){ | |
2529 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17, | |
2530 &coeff_token_len [i][0], 1, 1, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2531 &coeff_token_bits[i][0], 1, 1, 1); |
1168 | 2532 } |
2533 | |
2534 for(i=0; i<3; i++){ | |
2535 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4, | |
2536 &chroma_dc_total_zeros_len [i][0], 1, 1, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2537 &chroma_dc_total_zeros_bits[i][0], 1, 1, 1); |
1168 | 2538 } |
2539 for(i=0; i<15; i++){ | |
2540 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16, | |
2541 &total_zeros_len [i][0], 1, 1, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2542 &total_zeros_bits[i][0], 1, 1, 1); |
1168 | 2543 } |
2544 | |
2545 for(i=0; i<6; i++){ | |
2546 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7, | |
2547 &run_len [i][0], 1, 1, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2548 &run_bits[i][0], 1, 1, 1); |
1168 | 2549 } |
2550 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16, | |
2551 &run_len [6][0], 1, 1, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2552 &run_bits[6][0], 1, 1, 1); |
1168 | 2553 } |
2554 } | |
2555 | |
2556 /** | |
2557 * Sets the intra prediction function pointers. | |
2558 */ | |
2559 static void init_pred_ptrs(H264Context *h){ | |
2560 // MpegEncContext * const s = &h->s; | |
2561 | |
2562 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; | |
2563 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; | |
2564 h->pred4x4[DC_PRED ]= pred4x4_dc_c; | |
2565 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c; | |
2566 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c; | |
2567 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c; | |
2568 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c; | |
2569 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c; | |
2570 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c; | |
2571 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c; | |
2572 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c; | |
2573 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; | |
2574 | |
2575 h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c; | |
2576 h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c; | |
2577 h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c; | |
2578 h->pred8x8[PLANE_PRED8x8 ]= pred8x8_plane_c; | |
2579 h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c; | |
2580 h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c; | |
2581 h->pred8x8[DC_128_PRED8x8 ]= pred8x8_128_dc_c; | |
2582 | |
2583 h->pred16x16[DC_PRED8x8 ]= pred16x16_dc_c; | |
2584 h->pred16x16[VERT_PRED8x8 ]= pred16x16_vertical_c; | |
2585 h->pred16x16[HOR_PRED8x8 ]= pred16x16_horizontal_c; | |
2586 h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c; | |
2587 h->pred16x16[LEFT_DC_PRED8x8]= pred16x16_left_dc_c; | |
2588 h->pred16x16[TOP_DC_PRED8x8 ]= pred16x16_top_dc_c; | |
2589 h->pred16x16[DC_128_PRED8x8 ]= pred16x16_128_dc_c; | |
2590 } | |
2591 | |
2592 static void free_tables(H264Context *h){ | |
2593 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
|
2594 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
|
2595 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
|
2596 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
|
2597 av_freep(&h->mvd_table[1]); |
2396 | 2598 av_freep(&h->direct_table); |
1168 | 2599 av_freep(&h->non_zero_count); |
2600 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
|
2601 av_freep(&h->top_border); |
1168 | 2602 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
|
2603 |
1168 | 2604 av_freep(&h->mb2b_xy); |
2605 av_freep(&h->mb2b8_xy); | |
2415 | 2606 |
2607 av_freep(&h->s.obmc_scratchpad); | |
1168 | 2608 } |
2609 | |
2610 /** | |
2611 * allocates tables. | |
2612 * needs widzh/height | |
2613 */ | |
2614 static int alloc_tables(H264Context *h){ | |
2615 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
|
2616 const int big_mb_num= s->mb_stride * (s->mb_height+1); |
1168 | 2617 int x,y; |
2618 | |
2619 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
|
2620 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2621 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t)) |
1168 | 2622 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
|
2623 CHECKED_ALLOCZ(h->top_border , s->mb_width * (16+8+8) * sizeof(uint8_t)) |
2336 | 2624 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t)) |
1168 | 2625 |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2626 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
|
2627 CHECKED_ALLOCZ(h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t)) |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2628 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
|
2629 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t)); |
2396 | 2630 CHECKED_ALLOCZ(h->direct_table, 32*big_mb_num * 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
|
2631 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2632 |
1168 | 2633 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
|
2634 h->slice_table= h->slice_table_base + s->mb_stride + 1; |
1168 | 2635 |
2636 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint16_t)); | |
2637 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint16_t)); | |
2638 for(y=0; y<s->mb_height; y++){ | |
2639 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
|
2640 const int mb_xy= x + y*s->mb_stride; |
1168 | 2641 const int b_xy = 4*x + 4*y*h->b_stride; |
2642 const int b8_xy= 2*x + 2*y*h->b8_stride; | |
2643 | |
2644 h->mb2b_xy [mb_xy]= b_xy; | |
2645 h->mb2b8_xy[mb_xy]= b8_xy; | |
2646 } | |
2647 } | |
2415 | 2648 |
2417 | 2649 s->obmc_scratchpad = NULL; |
2650 | |
1168 | 2651 return 0; |
2652 fail: | |
2653 free_tables(h); | |
2654 return -1; | |
2655 } | |
2656 | |
2657 static void common_init(H264Context *h){ | |
2658 MpegEncContext * const s = &h->s; | |
2659 | |
2660 s->width = s->avctx->width; | |
2661 s->height = s->avctx->height; | |
2662 s->codec_id= s->avctx->codec->id; | |
2663 | |
2664 init_pred_ptrs(h); | |
2665 | |
1698 | 2666 s->unrestricted_mv=1; |
1168 | 2667 s->decode=1; //FIXME |
2668 } | |
2669 | |
2670 static int decode_init(AVCodecContext *avctx){ | |
2671 H264Context *h= avctx->priv_data; | |
2672 MpegEncContext * const s = &h->s; | |
2673 | |
1892 | 2674 MPV_decode_defaults(s); |
2675 | |
1168 | 2676 s->avctx = avctx; |
2677 common_init(h); | |
2678 | |
2679 s->out_format = FMT_H264; | |
2680 s->workaround_bugs= avctx->workaround_bugs; | |
2681 | |
2682 // set defaults | |
2683 // s->decode_mb= ff_h263_decode_mb; | |
2684 s->low_delay= 1; | |
2685 avctx->pix_fmt= PIX_FMT_YUV420P; | |
2686 | |
2687 decode_init_vlc(h); | |
2688 | |
2547
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2689 if(avctx->extradata_size > 0 && avctx->extradata && |
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2690 *(char *)avctx->extradata == 1){ |
2227 | 2691 h->is_avc = 1; |
2692 h->got_avcC = 0; | |
2547
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2693 } else { |
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2694 h->is_avc = 0; |
2227 | 2695 } |
2696 | |
1168 | 2697 return 0; |
2698 } | |
2699 | |
2700 static void frame_start(H264Context *h){ | |
2701 MpegEncContext * const s = &h->s; | |
2702 int i; | |
2703 | |
2704 MPV_frame_start(s, s->avctx); | |
2705 ff_er_frame_start(s); | |
2706 | |
2707 assert(s->linesize && s->uvlinesize); | |
2708 | |
2709 for(i=0; i<16; i++){ | |
2710 h->block_offset[i]= 4*((scan8[i] - scan8[0])&7) + 4*s->linesize*((scan8[i] - scan8[0])>>3); | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2711 h->block_offset[24+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->linesize*((scan8[i] - scan8[0])>>3); |
1168 | 2712 } |
2713 for(i=0; i<4; i++){ | |
2714 h->block_offset[16+i]= | |
2715 h->block_offset[20+i]= 4*((scan8[i] - scan8[0])&7) + 4*s->uvlinesize*((scan8[i] - scan8[0])>>3); | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2716 h->block_offset[24+16+i]= |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2717 h->block_offset[24+20+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->uvlinesize*((scan8[i] - scan8[0])>>3); |
1168 | 2718 } |
2719 | |
2416
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2720 /* can't be in alloc_tables because linesize isn't known there. |
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2721 * FIXME: redo bipred weight to not require extra buffer? */ |
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2722 if(!s->obmc_scratchpad) |
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2723 s->obmc_scratchpad = av_malloc(16*s->linesize + 2*8*s->uvlinesize); |
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2724 |
1168 | 2725 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; |
2726 } | |
2727 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2728 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
|
2729 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
|
2730 int i; |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2731 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2732 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
|
2733 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
|
2734 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
|
2735 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2736 // There is two lines saved, the line above the the top macroblock of a pair, |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2737 // and the line above the bottom macroblock |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2738 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
|
2739 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
|
2740 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
|
2741 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2742 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2743 *(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
|
2744 *(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
|
2745 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2746 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
|
2747 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
|
2748 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
|
2749 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
|
2750 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
|
2751 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
|
2752 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2753 *(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
|
2754 *(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
|
2755 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2756 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2757 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2758 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
|
2759 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
|
2760 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
|
2761 uint64_t temp64; |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2762 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
|
2763 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
|
2764 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2765 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
|
2766 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
|
2767 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
|
2768 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2769 #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
|
2770 t= a;\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2771 if(xchg)\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2772 a= b;\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2773 b= t; |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2774 |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2775 if(deblock_left){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2776 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
|
2777 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
|
2778 } |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2779 } |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2780 |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2781 if(deblock_top){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2782 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
|
2783 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
|
2784 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2785 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2786 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
|
2787 if(deblock_left){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2788 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
|
2789 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
|
2790 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
|
2791 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2792 } |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2793 if(deblock_top){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2794 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
|
2795 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
|
2796 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2797 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2798 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2799 |
1168 | 2800 static void hl_decode_mb(H264Context *h){ |
2801 MpegEncContext * const s = &h->s; | |
2802 const int mb_x= s->mb_x; | |
2803 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
|
2804 const int mb_xy= mb_x + mb_y*s->mb_stride; |
1168 | 2805 const int mb_type= s->current_picture.mb_type[mb_xy]; |
2806 uint8_t *dest_y, *dest_cb, *dest_cr; | |
2807 int linesize, uvlinesize /*dct_offset*/; | |
2808 int i; | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2809 int *block_offset = &h->block_offset[0]; |
1168 | 2810 |
2811 if(!s->decode) | |
2812 return; | |
2813 | |
2814 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; | |
2815 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
2816 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
2817 | |
2818 if (h->mb_field_decoding_flag) { | |
2819 linesize = s->linesize * 2; | |
2820 uvlinesize = s->uvlinesize * 2; | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2821 block_offset = &h->block_offset[24]; |
1168 | 2822 if(mb_y&1){ //FIXME move out of this func? |
2823 dest_y -= s->linesize*15; | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2824 dest_cb-= s->uvlinesize*7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2825 dest_cr-= s->uvlinesize*7; |
1168 | 2826 } |
2827 } else { | |
2828 linesize = s->linesize; | |
2829 uvlinesize = s->uvlinesize; | |
2830 // dct_offset = s->linesize * 16; | |
2831 } | |
2832 | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2833 if (IS_INTRA_PCM(mb_type)) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2834 unsigned int x, y; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2835 |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2836 // The pixels are stored in h->mb array in the same order as levels, |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2837 // copy them in output in the correct order. |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2838 for(i=0; i<16; i++) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2839 for (y=0; y<4; y++) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2840 for (x=0; x<4; x++) { |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2841 *(dest_y + block_offset[i] + y*linesize + x) = h->mb[i*16+y*4+x]; |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2842 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2843 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2844 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2845 for(i=16; i<16+4; i++) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2846 for (y=0; y<4; y++) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2847 for (x=0; x<4; x++) { |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2848 *(dest_cb + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x]; |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2849 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2850 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2851 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2852 for(i=20; i<20+4; i++) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2853 for (y=0; y<4; y++) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2854 for (x=0; x<4; x++) { |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2855 *(dest_cr + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x]; |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2856 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2857 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2858 } |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2859 } else { |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2860 if(IS_INTRA(mb_type)){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2861 if(h->deblocking_filter) |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2862 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2863 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2864 if(!(s->flags&CODEC_FLAG_GRAY)){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2865 h->pred8x8[ h->chroma_pred_mode ](dest_cb, uvlinesize); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2866 h->pred8x8[ h->chroma_pred_mode ](dest_cr, uvlinesize); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2867 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2868 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2869 if(IS_INTRA4x4(mb_type)){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2870 if(!s->encoding){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2871 for(i=0; i<16; i++){ |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2872 uint8_t * const ptr= dest_y + block_offset[i]; |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2873 uint8_t *topright; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2874 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ]; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2875 int tr; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2876 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2877 if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2878 const int topright_avail= (h->topright_samples_available<<i)&0x8000; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2879 assert(mb_y || linesize <= block_offset[i]); |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2880 if(!topright_avail){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2881 tr= ptr[3 - linesize]*0x01010101; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2882 topright= (uint8_t*) &tr; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2883 }else if(i==5 && h->deblocking_filter){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2884 tr= *(uint32_t*)h->top_border[mb_x+1]; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2885 topright= (uint8_t*) &tr; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2886 }else |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2887 topright= ptr + 4 - linesize; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2888 }else |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2889 topright= NULL; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2890 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2891 h->pred4x4[ dir ](ptr, topright, linesize); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2892 if(h->non_zero_count_cache[ scan8[i] ]){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2893 if(s->codec_id == CODEC_ID_H264) |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2894 s->dsp.h264_idct_add(ptr, h->mb + i*16, linesize); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2895 else |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2896 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2897 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2898 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2899 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2900 }else{ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2901 h->pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2902 if(s->codec_id == CODEC_ID_H264) |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2903 h264_luma_dc_dequant_idct_c(h->mb, s->qscale); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2904 else |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2905 svq3_luma_dc_dequant_idct_c(h->mb, s->qscale); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2906 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2907 if(h->deblocking_filter) |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2908 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2909 }else if(s->codec_id == CODEC_ID_H264){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2910 hl_motion(h, dest_y, dest_cb, dest_cr, |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2911 s->dsp.put_h264_qpel_pixels_tab, s->dsp.put_h264_chroma_pixels_tab, |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2912 s->dsp.avg_h264_qpel_pixels_tab, s->dsp.avg_h264_chroma_pixels_tab, |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2913 s->dsp.weight_h264_pixels_tab, s->dsp.biweight_h264_pixels_tab); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2914 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2915 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2916 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2917 if(!IS_INTRA4x4(mb_type)){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2918 if(s->codec_id == CODEC_ID_H264){ |
1168 | 2919 for(i=0; i<16; i++){ |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2920 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2921 uint8_t * const ptr= dest_y + block_offset[i]; |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2922 s->dsp.h264_idct_add(ptr, h->mb + i*16, linesize); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2923 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2924 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2925 }else{ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2926 for(i=0; i<16; i++){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2927 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2928 uint8_t * const ptr= dest_y + block_offset[i]; |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2929 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); |
1234 | 2930 } |
1168 | 2931 } |
2932 } | |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2933 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2934 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2935 if(!(s->flags&CODEC_FLAG_GRAY)){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2936 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2937 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2938 if(s->codec_id == CODEC_ID_H264){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2939 for(i=16; i<16+4; i++){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2940 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2941 uint8_t * const ptr= dest_cb + block_offset[i]; |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2942 s->dsp.h264_idct_add(ptr, h->mb + i*16, uvlinesize); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2943 } |
1250 | 2944 } |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2945 for(i=20; i<20+4; i++){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2946 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2947 uint8_t * const ptr= dest_cr + block_offset[i]; |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2948 s->dsp.h264_idct_add(ptr, h->mb + i*16, uvlinesize); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2949 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2950 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2951 }else{ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2952 for(i=16; i<16+4; i++){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2953 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2954 uint8_t * const ptr= dest_cb + block_offset[i]; |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2955 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2956 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2957 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2958 for(i=20; i<20+4; i++){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2959 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2960 uint8_t * const ptr= dest_cr + block_offset[i]; |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2961 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2); |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2962 } |
1250 | 2963 } |
1168 | 2964 } |
2965 } | |
2966 } | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2967 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
|
2968 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize); |
2449 | 2969 fill_caches(h, mb_type, 1); //FIXME dont fill stuff which isnt used by filter_mb |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2970 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
|
2971 } |
1168 | 2972 } |
2973 | |
2974 /** | |
2975 * fills the default_ref_list. | |
2976 */ | |
2977 static int fill_default_ref_list(H264Context *h){ | |
2978 MpegEncContext * const s = &h->s; | |
2979 int i; | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
2980 int smallest_poc_greater_than_current = -1; |
1168 | 2981 Picture sorted_short_ref[16]; |
2982 | |
2983 if(h->slice_type==B_TYPE){ | |
2984 int out_i; | |
2985 int limit= -1; | |
2986 | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
2987 /* sort frame according to poc in B slice */ |
1168 | 2988 for(out_i=0; out_i<h->short_ref_count; out_i++){ |
2989 int best_i=-1; | |
2255
507690ff49a2
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2254
diff
changeset
|
2990 int best_poc=INT_MAX; |
1168 | 2991 |
2992 for(i=0; i<h->short_ref_count; i++){ | |
2993 const int poc= h->short_ref[i]->poc; | |
2994 if(poc > limit && poc < best_poc){ | |
2995 best_poc= poc; | |
2996 best_i= i; | |
2997 } | |
2998 } | |
2999 | |
3000 assert(best_i != -1); | |
3001 | |
3002 limit= best_poc; | |
3003 sorted_short_ref[out_i]= *h->short_ref[best_i]; | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3004 tprintf("sorted poc: %d->%d poc:%d fn:%d\n", best_i, out_i, sorted_short_ref[out_i].poc, sorted_short_ref[out_i].frame_num); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3005 if (-1 == smallest_poc_greater_than_current) { |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3006 if (h->short_ref[best_i]->poc >= s->current_picture_ptr->poc) { |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3007 smallest_poc_greater_than_current = out_i; |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3008 } |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3009 } |
1168 | 3010 } |
3011 } | |
3012 | |
3013 if(s->picture_structure == PICT_FRAME){ | |
3014 if(h->slice_type==B_TYPE){ | |
3015 int list; | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3016 tprintf("current poc: %d, smallest_poc_greater_than_current: %d\n", s->current_picture_ptr->poc, smallest_poc_greater_than_current); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3017 |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3018 // find the largest poc |
1168 | 3019 for(list=0; list<2; list++){ |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3020 int index = 0; |
2447 | 3021 int j= -99; |
3022 int step= list ? -1 : 1; | |
3023 | |
3024 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++, j+=step) { | |
3025 while(j<0 || j>= h->short_ref_count){ | |
3026 step = -step; | |
3027 j= smallest_poc_greater_than_current + (step>>1); | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3028 } |
2447 | 3029 if(sorted_short_ref[j].reference != 3) continue; |
3030 h->default_ref_list[list][index ]= sorted_short_ref[j]; | |
3031 h->default_ref_list[list][index++].pic_id= sorted_short_ref[j].frame_num; | |
1168 | 3032 } |
3033 | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3034 for(i = 0; i < 16 && index < h->ref_count[ list ]; i++){ |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3035 if(h->long_ref[i] == NULL) continue; |
1168 | 3036 if(h->long_ref[i]->reference != 3) continue; |
3037 | |
3038 h->default_ref_list[ list ][index ]= *h->long_ref[i]; | |
3039 h->default_ref_list[ list ][index++].pic_id= i;; | |
3040 } | |
3041 | |
2447 | 3042 if(list && (smallest_poc_greater_than_current<=0 || smallest_poc_greater_than_current>=h->short_ref_count) && (1 < index)){ |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3043 // swap the two first elements of L1 when |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3044 // L0 and L1 are identical |
1168 | 3045 Picture temp= h->default_ref_list[1][0]; |
3046 h->default_ref_list[1][0] = h->default_ref_list[1][1]; | |
3047 h->default_ref_list[1][0] = temp; | |
3048 } | |
3049 | |
3050 if(index < h->ref_count[ list ]) | |
3051 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index)); | |
3052 } | |
3053 }else{ | |
3054 int index=0; | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3055 for(i=0; i<h->short_ref_count; i++){ |
1168 | 3056 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit |
3057 h->default_ref_list[0][index ]= *h->short_ref[i]; | |
3058 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num; | |
3059 } | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3060 for(i = 0; i < 16; i++){ |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3061 if(h->long_ref[i] == NULL) continue; |
1168 | 3062 if(h->long_ref[i]->reference != 3) continue; |
3063 h->default_ref_list[0][index ]= *h->long_ref[i]; | |
3064 h->default_ref_list[0][index++].pic_id= i;; | |
3065 } | |
3066 if(index < h->ref_count[0]) | |
3067 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index)); | |
3068 } | |
3069 }else{ //FIELD | |
3070 if(h->slice_type==B_TYPE){ | |
3071 }else{ | |
3072 //FIXME second field balh | |
3073 } | |
3074 } | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3075 #ifdef TRACE |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3076 for (i=0; i<h->ref_count[0]; i++) { |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3077 tprintf("List0: %s fn:%d 0x%p\n", (h->default_ref_list[0][i].long_ref ? "LT" : "ST"), h->default_ref_list[0][i].pic_id, h->default_ref_list[0][i].data[0]); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3078 } |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3079 if(h->slice_type==B_TYPE){ |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3080 for (i=0; i<h->ref_count[1]; i++) { |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3081 tprintf("List1: %s fn:%d 0x%p\n", (h->default_ref_list[1][i].long_ref ? "LT" : "ST"), h->default_ref_list[1][i].pic_id, h->default_ref_list[0][i].data[0]); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3082 } |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3083 } |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3084 #endif |
1168 | 3085 return 0; |
3086 } | |
3087 | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3088 static void print_short_term(H264Context *h); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3089 static void print_long_term(H264Context *h); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3090 |
1168 | 3091 static int decode_ref_pic_list_reordering(H264Context *h){ |
3092 MpegEncContext * const s = &h->s; | |
3093 int list; | |
3094 | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3095 print_short_term(h); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3096 print_long_term(h); |
1168 | 3097 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move beofre func |
3098 | |
3099 for(list=0; list<2; list++){ | |
3100 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]); | |
3101 | |
3102 if(get_bits1(&s->gb)){ | |
3103 int pred= h->curr_pic_num; | |
3104 int index; | |
3105 | |
3106 for(index=0; ; index++){ | |
3107 int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb); | |
3108 int pic_id; | |
3109 int i; | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3110 Picture *ref = NULL; |
1168 | 3111 |
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3112 if(reordering_of_pic_nums_idc==3) |
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3113 break; |
1168 | 3114 |
3115 if(index >= h->ref_count[list]){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3116 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n"); |
1168 | 3117 return -1; |
3118 } | |
3119 | |
3120 if(reordering_of_pic_nums_idc<3){ | |
3121 if(reordering_of_pic_nums_idc<2){ | |
3122 const int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1; | |
3123 | |
3124 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
|
3125 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n"); |
1168 | 3126 return -1; |
3127 } | |
3128 | |
3129 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num; | |
3130 else pred+= abs_diff_pic_num; | |
3131 pred &= h->max_pic_num - 1; | |
3132 | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3133 for(i= h->short_ref_count-1; i>=0; i--){ |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3134 ref = h->short_ref[i]; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3135 if(ref->data[0] != NULL && ref->frame_num == pred && ref->long_ref == 0) // ignore non existing pictures by testing data[0] pointer |
1168 | 3136 break; |
3137 } | |
3138 }else{ | |
3139 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3140 ref = h->long_ref[pic_id]; |
1168 | 3141 } |
3142 | |
2485
2844b8cf4e11
H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents:
2484
diff
changeset
|
3143 if (i < 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3144 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n"); |
1168 | 3145 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3146 } else { |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3147 h->ref_list[list][index]= *ref; |
1168 | 3148 } |
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3149 }else{ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3150 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n"); |
1168 | 3151 return -1; |
3152 } | |
3153 } | |
3154 } | |
3155 | |
3156 if(h->slice_type!=B_TYPE) break; | |
3157 } | |
2396 | 3158 |
3159 if(h->slice_type==B_TYPE && !h->direct_spatial_mv_pred) | |
3160 direct_dist_scale_factor(h); | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3161 direct_ref_list_init(h); |
1168 | 3162 return 0; |
3163 } | |
3164 | |
3165 static int pred_weight_table(H264Context *h){ | |
3166 MpegEncContext * const s = &h->s; | |
3167 int list, i; | |
2415 | 3168 int luma_def, chroma_def; |
1168 | 3169 |
2415 | 3170 h->use_weight= 0; |
3171 h->use_weight_chroma= 0; | |
1168 | 3172 h->luma_log2_weight_denom= get_ue_golomb(&s->gb); |
3173 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb); | |
2415 | 3174 luma_def = 1<<h->luma_log2_weight_denom; |
3175 chroma_def = 1<<h->chroma_log2_weight_denom; | |
1168 | 3176 |
3177 for(list=0; list<2; list++){ | |
3178 for(i=0; i<h->ref_count[list]; i++){ | |
3179 int luma_weight_flag, chroma_weight_flag; | |
3180 | |
3181 luma_weight_flag= get_bits1(&s->gb); | |
3182 if(luma_weight_flag){ | |
3183 h->luma_weight[list][i]= get_se_golomb(&s->gb); | |
3184 h->luma_offset[list][i]= get_se_golomb(&s->gb); | |
2415 | 3185 if( h->luma_weight[list][i] != luma_def |
3186 || h->luma_offset[list][i] != 0) | |
3187 h->use_weight= 1; | |
3188 }else{ | |
3189 h->luma_weight[list][i]= luma_def; | |
3190 h->luma_offset[list][i]= 0; | |
1168 | 3191 } |
3192 | |
3193 chroma_weight_flag= get_bits1(&s->gb); | |
3194 if(chroma_weight_flag){ | |
3195 int j; | |
3196 for(j=0; j<2; j++){ | |
3197 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb); | |
3198 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb); | |
2415 | 3199 if( h->chroma_weight[list][i][j] != chroma_def |
3200 || h->chroma_offset[list][i][j] != 0) | |
3201 h->use_weight_chroma= 1; | |
3202 } | |
3203 }else{ | |
3204 int j; | |
3205 for(j=0; j<2; j++){ | |
3206 h->chroma_weight[list][i][j]= chroma_def; | |
3207 h->chroma_offset[list][i][j]= 0; | |
1168 | 3208 } |
3209 } | |
3210 } | |
3211 if(h->slice_type != B_TYPE) break; | |
3212 } | |
2415 | 3213 h->use_weight= h->use_weight || h->use_weight_chroma; |
1168 | 3214 return 0; |
3215 } | |
3216 | |
2415 | 3217 static void implicit_weight_table(H264Context *h){ |
3218 MpegEncContext * const s = &h->s; | |
3219 int ref0, ref1; | |
3220 int cur_poc = s->current_picture_ptr->poc; | |
3221 | |
3222 if( h->ref_count[0] == 1 && h->ref_count[1] == 1 | |
3223 && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){ | |
3224 h->use_weight= 0; | |
3225 h->use_weight_chroma= 0; | |
3226 return; | |
3227 } | |
3228 | |
3229 h->use_weight= 2; | |
3230 h->use_weight_chroma= 2; | |
3231 h->luma_log2_weight_denom= 5; | |
3232 h->chroma_log2_weight_denom= 5; | |
3233 | |
3234 /* FIXME: MBAFF */ | |
3235 for(ref0=0; ref0 < h->ref_count[0]; ref0++){ | |
3236 int poc0 = h->ref_list[0][ref0].poc; | |
3237 for(ref1=0; ref1 < h->ref_count[1]; ref1++){ | |
2519 | 3238 int poc1 = h->ref_list[1][ref1].poc; |
2415 | 3239 int td = clip(poc1 - poc0, -128, 127); |
3240 if(td){ | |
3241 int tb = clip(cur_poc - poc0, -128, 127); | |
3242 int tx = (16384 + (ABS(td) >> 1)) / td; | |
3243 int dist_scale_factor = clip((tb*tx + 32) >> 6, -1024, 1023) >> 2; | |
3244 if(dist_scale_factor < -64 || dist_scale_factor > 128) | |
3245 h->implicit_weight[ref0][ref1] = 32; | |
3246 else | |
3247 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor; | |
3248 }else | |
3249 h->implicit_weight[ref0][ref1] = 32; | |
3250 } | |
3251 } | |
3252 } | |
3253 | |
1168 | 3254 /** |
2392 | 3255 * instantaneous decoder refresh. |
1168 | 3256 */ |
3257 static void idr(H264Context *h){ | |
2409 | 3258 int i,j; |
3259 | |
3260 #define CHECK_DELAY(pic) \ | |
3261 for(j = 0; h->delayed_pic[j]; j++) \ | |
3262 if(pic == h->delayed_pic[j]){ \ | |
3263 pic->reference=1; \ | |
3264 break; \ | |
3265 } | |
1168 | 3266 |
2484
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3267 for(i=0; i<16; i++){ |
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3268 if (h->long_ref[i] != NULL) { |
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3269 h->long_ref[i]->reference=0; |
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3270 CHECK_DELAY(h->long_ref[i]); |
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3271 h->long_ref[i]= NULL; |
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3272 } |
1168 | 3273 } |
3274 h->long_ref_count=0; | |
3275 | |
3276 for(i=0; i<h->short_ref_count; i++){ | |
3277 h->short_ref[i]->reference=0; | |
2409 | 3278 CHECK_DELAY(h->short_ref[i]); |
1168 | 3279 h->short_ref[i]= NULL; |
3280 } | |
3281 h->short_ref_count=0; | |
3282 } | |
2409 | 3283 #undef CHECK_DELAY |
1168 | 3284 |
3285 /** | |
3286 * | |
3287 * @return the removed picture or NULL if an error occures | |
3288 */ | |
3289 static Picture * remove_short(H264Context *h, int frame_num){ | |
1169 | 3290 MpegEncContext * const s = &h->s; |
1168 | 3291 int i; |
3292 | |
1169 | 3293 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
|
3294 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count); |
1169 | 3295 |
1168 | 3296 for(i=0; i<h->short_ref_count; i++){ |
3297 Picture *pic= h->short_ref[i]; | |
1169 | 3298 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
|
3299 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic); |
1168 | 3300 if(pic->frame_num == frame_num){ |
3301 h->short_ref[i]= NULL; | |
3302 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*)); | |
3303 h->short_ref_count--; | |
3304 return pic; | |
3305 } | |
3306 } | |
3307 return NULL; | |
3308 } | |
3309 | |
3310 /** | |
3311 * | |
3312 * @return the removed picture or NULL if an error occures | |
3313 */ | |
3314 static Picture * remove_long(H264Context *h, int i){ | |
3315 Picture *pic; | |
3316 | |
3317 pic= h->long_ref[i]; | |
3318 h->long_ref[i]= NULL; | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3319 if(pic) h->long_ref_count--; |
1168 | 3320 |
3321 return pic; | |
3322 } | |
3323 | |
3324 /** | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3325 * print short term list |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3326 */ |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3327 static void print_short_term(H264Context *h) { |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3328 uint32_t i; |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3329 if(h->s.avctx->debug&FF_DEBUG_MMCO) { |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3330 av_log(h->s.avctx, AV_LOG_DEBUG, "short term list:\n"); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3331 for(i=0; i<h->short_ref_count; i++){ |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3332 Picture *pic= h->short_ref[i]; |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3333 av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n", i, pic->frame_num, pic->poc, pic->data[0]); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3334 } |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3335 } |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3336 } |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3337 |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3338 /** |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3339 * print long term list |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3340 */ |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3341 static void print_long_term(H264Context *h) { |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3342 uint32_t i; |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3343 if(h->s.avctx->debug&FF_DEBUG_MMCO) { |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3344 av_log(h->s.avctx, AV_LOG_DEBUG, "long term list:\n"); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3345 for(i = 0; i < 16; i++){ |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3346 Picture *pic= h->long_ref[i]; |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3347 if (pic) { |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3348 av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n", i, pic->frame_num, pic->poc, pic->data[0]); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3349 } |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3350 } |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3351 } |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3352 } |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3353 |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3354 /** |
1168 | 3355 * Executes the reference picture marking (memory management control operations). |
3356 */ | |
3357 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ | |
3358 MpegEncContext * const s = &h->s; | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3359 int i, j; |
1168 | 3360 int current_is_long=0; |
3361 Picture *pic; | |
3362 | |
3363 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
|
3364 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n"); |
1168 | 3365 |
3366 for(i=0; i<mmco_count; i++){ | |
3367 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
|
3368 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 | 3369 |
3370 switch(mmco[i].opcode){ | |
3371 case MMCO_SHORT2UNUSED: | |
3372 pic= remove_short(h, mmco[i].short_frame_num); | |
3373 if(pic==NULL) return -1; | |
3374 pic->reference= 0; | |
3375 break; | |
3376 case MMCO_SHORT2LONG: | |
3377 pic= remove_long(h, mmco[i].long_index); | |
3378 if(pic) pic->reference=0; | |
3379 | |
3380 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num); | |
3381 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
2484
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3382 h->long_ref_count++; |
1168 | 3383 break; |
3384 case MMCO_LONG2UNUSED: | |
3385 pic= remove_long(h, mmco[i].long_index); | |
3386 if(pic==NULL) return -1; | |
3387 pic->reference= 0; | |
3388 break; | |
3389 case MMCO_LONG: | |
3390 pic= remove_long(h, mmco[i].long_index); | |
3391 if(pic) pic->reference=0; | |
3392 | |
3393 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr; | |
3394 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
3395 h->long_ref_count++; | |
3396 | |
3397 current_is_long=1; | |
3398 break; | |
3399 case MMCO_SET_MAX_LONG: | |
3400 assert(mmco[i].long_index <= 16); | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3401 // just remove the long term which index is greater than new max |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3402 for(j = mmco[i].long_index; j<16; j++){ |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3403 pic = remove_long(h, j); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3404 if (pic) pic->reference=0; |
1168 | 3405 } |
3406 break; | |
3407 case MMCO_RESET: | |
3408 while(h->short_ref_count){ | |
3409 pic= remove_short(h, h->short_ref[0]->frame_num); | |
3410 pic->reference=0; | |
3411 } | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3412 for(j = 0; j < 16; j++) { |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3413 pic= remove_long(h, j); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3414 if(pic) pic->reference=0; |
1168 | 3415 } |
3416 break; | |
3417 default: assert(0); | |
3418 } | |
3419 } | |
3420 | |
3421 if(!current_is_long){ | |
3422 pic= remove_short(h, s->current_picture_ptr->frame_num); | |
3423 if(pic){ | |
3424 pic->reference=0; | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3425 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n"); |
1168 | 3426 } |
3427 | |
3428 if(h->short_ref_count) | |
1169 | 3429 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*)); |
3430 | |
3431 h->short_ref[0]= s->current_picture_ptr; | |
1168 | 3432 h->short_ref[0]->long_ref=0; |
3433 h->short_ref_count++; | |
3434 } | |
3435 | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3436 print_short_term(h); |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3437 print_long_term(h); |
1168 | 3438 return 0; |
3439 } | |
3440 | |
3441 static int decode_ref_pic_marking(H264Context *h){ | |
3442 MpegEncContext * const s = &h->s; | |
3443 int i; | |
3444 | |
3445 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields | |
3446 s->broken_link= get_bits1(&s->gb) -1; | |
3447 h->mmco[0].long_index= get_bits1(&s->gb) - 1; // current_long_term_idx | |
3448 if(h->mmco[0].long_index == -1) | |
3449 h->mmco_index= 0; | |
3450 else{ | |
3451 h->mmco[0].opcode= MMCO_LONG; | |
3452 h->mmco_index= 1; | |
3453 } | |
3454 }else{ | |
3455 if(get_bits1(&s->gb)){ // adaptive_ref_pic_marking_mode_flag | |
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
3456 for(i= 0; i<MAX_MMCO_COUNT; i++) { |
1168 | 3457 MMCOOpcode opcode= get_ue_golomb(&s->gb);; |
3458 | |
3459 h->mmco[i].opcode= opcode; | |
3460 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){ | |
3461 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 | |
3462 /* if(h->mmco[i].short_frame_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_frame_num ] == NULL){ | |
3463 fprintf(stderr, "illegal short ref in memory management control operation %d\n", mmco); | |
3464 return -1; | |
3465 }*/ | |
3466 } | |
3467 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){ | |
3468 h->mmco[i].long_index= get_ue_golomb(&s->gb); | |
3469 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
|
3470 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); |
1168 | 3471 return -1; |
3472 } | |
3473 } | |
3474 | |
3475 if(opcode > MMCO_LONG){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3476 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); |
1168 | 3477 return -1; |
3478 } | |
2255
507690ff49a2
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2254
diff
changeset
|
3479 if(opcode == MMCO_END) |
507690ff49a2
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2254
diff
changeset
|
3480 break; |
1168 | 3481 } |
3482 h->mmco_index= i; | |
3483 }else{ | |
3484 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count); | |
3485 | |
3486 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields | |
3487 h->mmco[0].opcode= MMCO_SHORT2UNUSED; | |
3488 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num; | |
3489 h->mmco_index= 1; | |
3490 }else | |
3491 h->mmco_index= 0; | |
3492 } | |
3493 } | |
3494 | |
3495 return 0; | |
3496 } | |
3497 | |
3498 static int init_poc(H264Context *h){ | |
3499 MpegEncContext * const s = &h->s; | |
3500 const int max_frame_num= 1<<h->sps.log2_max_frame_num; | |
3501 int field_poc[2]; | |
3502 | |
3503 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
3504 h->frame_num_offset= 0; | |
3505 }else{ | |
3506 if(h->frame_num < h->prev_frame_num) | |
3507 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num; | |
3508 else | |
3509 h->frame_num_offset= h->prev_frame_num_offset; | |
3510 } | |
3511 | |
3512 if(h->sps.poc_type==0){ | |
3513 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb; | |
3514 | |
3515 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2) | |
3516 h->poc_msb = h->prev_poc_msb + max_poc_lsb; | |
3517 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2) | |
3518 h->poc_msb = h->prev_poc_msb - max_poc_lsb; | |
3519 else | |
3520 h->poc_msb = h->prev_poc_msb; | |
3521 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb); | |
3522 field_poc[0] = | |
3523 field_poc[1] = h->poc_msb + h->poc_lsb; | |
3524 if(s->picture_structure == PICT_FRAME) | |
3525 field_poc[1] += h->delta_poc_bottom; | |
3526 }else if(h->sps.poc_type==1){ | |
3527 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc; | |
3528 int i; | |
3529 | |
3530 if(h->sps.poc_cycle_length != 0) | |
3531 abs_frame_num = h->frame_num_offset + h->frame_num; | |
3532 else | |
3533 abs_frame_num = 0; | |
3534 | |
3535 if(h->nal_ref_idc==0 && abs_frame_num > 0) | |
3536 abs_frame_num--; | |
3537 | |
3538 expected_delta_per_poc_cycle = 0; | |
3539 for(i=0; i < h->sps.poc_cycle_length; i++) | |
3540 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse | |
3541 | |
3542 if(abs_frame_num > 0){ | |
3543 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length; | |
3544 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length; | |
3545 | |
3546 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle; | |
3547 for(i = 0; i <= frame_num_in_poc_cycle; i++) | |
3548 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ]; | |
3549 } else | |
3550 expectedpoc = 0; | |
3551 | |
3552 if(h->nal_ref_idc == 0) | |
3553 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic; | |
3554 | |
3555 field_poc[0] = expectedpoc + h->delta_poc[0]; | |
3556 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field; | |
3557 | |
3558 if(s->picture_structure == PICT_FRAME) | |
3559 field_poc[1] += h->delta_poc[1]; | |
3560 }else{ | |
3561 int poc; | |
3562 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
3563 poc= 0; | |
3564 }else{ | |
3565 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num); | |
3566 else poc= 2*(h->frame_num_offset + h->frame_num) - 1; | |
3567 } | |
3568 field_poc[0]= poc; | |
3569 field_poc[1]= poc; | |
3570 } | |
3571 | |
3572 if(s->picture_structure != PICT_BOTTOM_FIELD) | |
3573 s->current_picture_ptr->field_poc[0]= field_poc[0]; | |
3574 if(s->picture_structure != PICT_TOP_FIELD) | |
3575 s->current_picture_ptr->field_poc[1]= field_poc[1]; | |
3576 if(s->picture_structure == PICT_FRAME) // FIXME field pix? | |
3577 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]); | |
3578 | |
3579 return 0; | |
3580 } | |
3581 | |
3582 /** | |
3583 * decodes a slice header. | |
3584 * this will allso call MPV_common_init() and frame_start() as needed | |
3585 */ | |
3586 static int decode_slice_header(H264Context *h){ | |
3587 MpegEncContext * const s = &h->s; | |
3588 int first_mb_in_slice, pps_id; | |
3589 int num_ref_idx_active_override_flag; | |
3590 static const uint8_t slice_type_map[5]= {P_TYPE, B_TYPE, I_TYPE, SP_TYPE, SI_TYPE}; | |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3591 int slice_type; |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3592 int default_ref_list_done = 0; |
1168 | 3593 |
3594 s->current_picture.reference= h->nal_ref_idc != 0; | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3595 s->dropable= h->nal_ref_idc == 0; |
1168 | 3596 |
3597 first_mb_in_slice= get_ue_golomb(&s->gb); | |
3598 | |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3599 slice_type= get_ue_golomb(&s->gb); |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3600 if(slice_type > 9){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3601 av_log(h->s.avctx, AV_LOG_ERROR, "slice type too large (%d) at %d %d\n", h->slice_type, s->mb_x, s->mb_y); |
2392 | 3602 return -1; |
1168 | 3603 } |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3604 if(slice_type > 4){ |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3605 slice_type -= 5; |
1168 | 3606 h->slice_type_fixed=1; |
3607 }else | |
3608 h->slice_type_fixed=0; | |
3609 | |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3610 slice_type= slice_type_map[ slice_type ]; |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3611 if (slice_type == I_TYPE |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3612 || (h->slice_num != 0 && slice_type == h->slice_type) ) { |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3613 default_ref_list_done = 1; |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3614 } |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3615 h->slice_type= slice_type; |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3616 |
1168 | 3617 s->pict_type= h->slice_type; // to make a few old func happy, its wrong though |
3618 | |
3619 pps_id= get_ue_golomb(&s->gb); | |
3620 if(pps_id>255){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3621 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n"); |
1168 | 3622 return -1; |
3623 } | |
3624 h->pps= h->pps_buffer[pps_id]; | |
1174 | 3625 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
|
3626 av_log(h->s.avctx, AV_LOG_ERROR, "non existing PPS referenced\n"); |
1174 | 3627 return -1; |
3628 } | |
3629 | |
1168 | 3630 h->sps= h->sps_buffer[ h->pps.sps_id ]; |
1174 | 3631 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
|
3632 av_log(h->s.avctx, AV_LOG_ERROR, "non existing SPS referenced\n"); |
1174 | 3633 return -1; |
3634 } | |
1168 | 3635 |
3636 s->mb_width= h->sps.mb_width; | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3637 s->mb_height= h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag); |
1168 | 3638 |
2395 | 3639 h->b_stride= s->mb_width*4 + 1; |
3640 h->b8_stride= s->mb_width*2 + 1; | |
1168 | 3641 |
1371 | 3642 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right ); |
1168 | 3643 if(h->sps.frame_mbs_only_flag) |
1371 | 3644 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom); |
1168 | 3645 else |
1371 | 3646 s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck |
1168 | 3647 |
3648 if (s->context_initialized | |
1548 | 3649 && ( s->width != s->avctx->width || s->height != s->avctx->height)) { |
1168 | 3650 free_tables(h); |
3651 MPV_common_end(s); | |
3652 } | |
3653 if (!s->context_initialized) { | |
3654 if (MPV_common_init(s) < 0) | |
3655 return -1; | |
3656 | |
3657 alloc_tables(h); | |
3658 | |
3659 s->avctx->width = s->width; | |
3660 s->avctx->height = s->height; | |
1548 | 3661 s->avctx->sample_aspect_ratio= h->sps.sar; |
2440 | 3662 if(!s->avctx->sample_aspect_ratio.den) |
3663 s->avctx->sample_aspect_ratio.den = 1; | |
2174
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
3664 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
3665 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
|
3666 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
|
3667 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
|
3668 } |
1168 | 3669 } |
3670 | |
2392 | 3671 if(h->slice_num == 0){ |
1168 | 3672 frame_start(h); |
3673 } | |
3674 | |
1169 | 3675 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup |
1168 | 3676 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num); |
3677 | |
3678 if(h->sps.frame_mbs_only_flag){ | |
3679 s->picture_structure= PICT_FRAME; | |
3680 }else{ | |
3681 if(get_bits1(&s->gb)) //field_pic_flag | |
3682 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3683 else { |
1168 | 3684 s->picture_structure= PICT_FRAME; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3685 first_mb_in_slice <<= 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3686 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3687 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3688 |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3689 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3690 s->resync_mb_y = s->mb_y = first_mb_in_slice / s->mb_width; //FIXME AFFW |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3691 |
1168 | 3692 if(s->picture_structure==PICT_FRAME){ |
3693 h->curr_pic_num= h->frame_num; | |
3694 h->max_pic_num= 1<< h->sps.log2_max_frame_num; | |
3695 }else{ | |
3696 h->curr_pic_num= 2*h->frame_num; | |
3697 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); | |
3698 } | |
3699 | |
3700 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
1453 | 3701 get_ue_golomb(&s->gb); /* idr_pic_id */ |
1168 | 3702 } |
3703 | |
3704 if(h->sps.poc_type==0){ | |
3705 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb); | |
3706 | |
3707 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){ | |
3708 h->delta_poc_bottom= get_se_golomb(&s->gb); | |
3709 } | |
3710 } | |
3711 | |
3712 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){ | |
3713 h->delta_poc[0]= get_se_golomb(&s->gb); | |
3714 | |
3715 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME) | |
3716 h->delta_poc[1]= get_se_golomb(&s->gb); | |
3717 } | |
3718 | |
3719 init_poc(h); | |
3720 | |
3721 if(h->pps.redundant_pic_cnt_present){ | |
3722 h->redundant_pic_count= get_ue_golomb(&s->gb); | |
3723 } | |
3724 | |
3725 //set defaults, might be overriden a few line later | |
3726 h->ref_count[0]= h->pps.ref_count[0]; | |
3727 h->ref_count[1]= h->pps.ref_count[1]; | |
3728 | |
3729 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){ | |
3730 if(h->slice_type == B_TYPE){ | |
3731 h->direct_spatial_mv_pred= get_bits1(&s->gb); | |
3732 } | |
3733 num_ref_idx_active_override_flag= get_bits1(&s->gb); | |
3734 | |
3735 if(num_ref_idx_active_override_flag){ | |
3736 h->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
3737 if(h->slice_type==B_TYPE) | |
3738 h->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
3739 | |
3740 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
|
3741 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n"); |
1168 | 3742 return -1; |
3743 } | |
3744 } | |
3745 } | |
3746 | |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3747 if(!default_ref_list_done){ |
1168 | 3748 fill_default_ref_list(h); |
3749 } | |
3750 | |
3751 decode_ref_pic_list_reordering(h); | |
3752 | |
3753 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE )) | |
3754 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) ) | |
3755 pred_weight_table(h); | |
2415 | 3756 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE) |
3757 implicit_weight_table(h); | |
3758 else | |
3759 h->use_weight = 0; | |
1168 | 3760 |
3761 if(s->current_picture.reference) | |
3762 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
|
3763 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3764 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
|
3765 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
|
3766 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3767 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
|
3768 s->qscale = h->pps.init_qp + get_se_golomb(&s->gb); |
1898 | 3769 if(s->qscale<0 || s->qscale>51){ |
3770 av_log(s->avctx, AV_LOG_ERROR, "QP %d out of range\n", s->qscale); | |
3771 return -1; | |
3772 } | |
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
3773 h->chroma_qp = get_chroma_qp(h, s->qscale); |
1168 | 3774 //FIXME qscale / qp ... stuff |
3775 if(h->slice_type == SP_TYPE){ | |
1453 | 3776 get_bits1(&s->gb); /* sp_for_switch_flag */ |
1168 | 3777 } |
3778 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){ | |
1453 | 3779 get_se_golomb(&s->gb); /* slice_qs_delta */ |
1168 | 3780 } |
3781 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3782 h->deblocking_filter = 1; |
1898 | 3783 h->slice_alpha_c0_offset = 0; |
3784 h->slice_beta_offset = 0; | |
1168 | 3785 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
|
3786 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
|
3787 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
|
3788 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
|
3789 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3790 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
|
3791 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
|
3792 h->slice_beta_offset = get_se_golomb(&s->gb) << 1; |
1168 | 3793 } |
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
|
3794 } |
1168 | 3795 |
3796 #if 0 //FMO | |
3797 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5) | |
3798 slice_group_change_cycle= get_bits(&s->gb, ?); | |
3799 #endif | |
3800 | |
2392 | 3801 h->slice_num++; |
3802 | |
1168 | 3803 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3804 av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c pps:%d frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d weight:%d%s\n", |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3805 h->slice_num, |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3806 (s->picture_structure==PICT_FRAME ? "F" : s->picture_structure==PICT_TOP_FIELD ? "T" : "B"), |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3807 first_mb_in_slice, |
1264 | 3808 av_get_pict_type_char(h->slice_type), |
1168 | 3809 pps_id, h->frame_num, |
3810 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], | |
3811 h->ref_count[0], h->ref_count[1], | |
3812 s->qscale, | |
2415 | 3813 h->deblocking_filter, |
3814 h->use_weight, | |
3815 h->use_weight==1 && h->use_weight_chroma ? "c" : "" | |
1168 | 3816 ); |
3817 } | |
3818 | |
3819 return 0; | |
3820 } | |
3821 | |
3822 /** | |
3823 * | |
3824 */ | |
3825 static inline int get_level_prefix(GetBitContext *gb){ | |
3826 unsigned int buf; | |
3827 int log; | |
3828 | |
3829 OPEN_READER(re, gb); | |
3830 UPDATE_CACHE(re, gb); | |
3831 buf=GET_CACHE(re, gb); | |
3832 | |
3833 log= 32 - av_log2(buf); | |
3834 #ifdef TRACE | |
3835 print_bin(buf>>(32-log), log); | |
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
3836 av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d lpr @%5d in %s get_level_prefix\n", buf>>(32-log), log, log-1, get_bits_count(gb), __FILE__); |
1168 | 3837 #endif |
3838 | |
3839 LAST_SKIP_BITS(re, gb, log); | |
3840 CLOSE_READER(re, gb); | |
3841 | |
3842 return log-1; | |
3843 } | |
3844 | |
3845 /** | |
3846 * decodes a residual block. | |
3847 * @param n block index | |
3848 * @param scantable scantable | |
3849 * @param max_coeff number of coefficients in the block | |
3850 * @return <0 if an error occured | |
3851 */ | |
3852 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, int qp, int max_coeff){ | |
3853 MpegEncContext * const s = &h->s; | |
3854 const uint16_t *qmul= dequant_coeff[qp]; | |
3855 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}; | |
3856 int level[16], run[16]; | |
3857 int suffix_length, zeros_left, coeff_num, coeff_token, total_coeff, i, trailing_ones; | |
3858 | |
3859 //FIXME put trailing_onex into the context | |
3860 | |
3861 if(n == CHROMA_DC_BLOCK_INDEX){ | |
3862 coeff_token= get_vlc2(gb, chroma_dc_coeff_token_vlc.table, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 1); | |
3863 total_coeff= coeff_token>>2; | |
3864 }else{ | |
3865 if(n == LUMA_DC_BLOCK_INDEX){ | |
3866 total_coeff= pred_non_zero_count(h, 0); | |
3867 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
3868 total_coeff= coeff_token>>2; | |
3869 }else{ | |
3870 total_coeff= pred_non_zero_count(h, n); | |
3871 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
3872 total_coeff= coeff_token>>2; | |
3873 h->non_zero_count_cache[ scan8[n] ]= total_coeff; | |
3874 } | |
3875 } | |
3876 | |
3877 //FIXME set last_non_zero? | |
3878 | |
3879 if(total_coeff==0) | |
3880 return 0; | |
3881 | |
3882 trailing_ones= coeff_token&3; | |
1170 | 3883 tprintf("trailing:%d, total:%d\n", trailing_ones, total_coeff); |
1168 | 3884 assert(total_coeff<=16); |
3885 | |
3886 for(i=0; i<trailing_ones; i++){ | |
3887 level[i]= 1 - 2*get_bits1(gb); | |
3888 } | |
3889 | |
3890 suffix_length= total_coeff > 10 && trailing_ones < 3; | |
3891 | |
3892 for(; i<total_coeff; i++){ | |
3893 const int prefix= get_level_prefix(gb); | |
3894 int level_code, mask; | |
3895 | |
3896 if(prefix<14){ //FIXME try to build a large unified VLC table for all this | |
3897 if(suffix_length) | |
3898 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
3899 else | |
3900 level_code= (prefix<<suffix_length); //part | |
3901 }else if(prefix==14){ | |
3902 if(suffix_length) | |
3903 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
3904 else | |
3905 level_code= prefix + get_bits(gb, 4); //part | |
3906 }else if(prefix==15){ | |
3907 level_code= (prefix<<suffix_length) + get_bits(gb, 12); //part | |
3908 if(suffix_length==0) level_code+=15; //FIXME doesnt make (much)sense | |
3909 }else{ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3910 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); |
1168 | 3911 return -1; |
3912 } | |
3913 | |
3914 if(i==trailing_ones && i<3) level_code+= 2; //FIXME split first iteration | |
3915 | |
3916 mask= -(level_code&1); | |
3917 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
3918 | |
3919 if(suffix_length==0) suffix_length=1; //FIXME split first iteration | |
3920 | |
3921 #if 1 | |
3922 if(ABS(level[i]) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++; | |
3923 #else | |
3924 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
|
3925 /* ? == prefix > 2 or sth */ |
1168 | 3926 #endif |
1170 | 3927 tprintf("level: %d suffix_length:%d\n", level[i], suffix_length); |
1168 | 3928 } |
3929 | |
3930 if(total_coeff == max_coeff) | |
3931 zeros_left=0; | |
3932 else{ | |
3933 if(n == CHROMA_DC_BLOCK_INDEX) | |
3934 zeros_left= get_vlc2(gb, chroma_dc_total_zeros_vlc[ total_coeff-1 ].table, CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 1); | |
3935 else | |
3936 zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1); | |
3937 } | |
3938 | |
3939 for(i=0; i<total_coeff-1; i++){ | |
3940 if(zeros_left <=0) | |
3941 break; | |
3942 else if(zeros_left < 7){ | |
3943 run[i]= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
3944 }else{ | |
3945 run[i]= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
3946 } | |
3947 zeros_left -= run[i]; | |
3948 } | |
3949 | |
3950 if(zeros_left<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3951 av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y); |
1168 | 3952 return -1; |
3953 } | |
3954 | |
3955 for(; i<total_coeff-1; i++){ | |
3956 run[i]= 0; | |
3957 } | |
3958 | |
3959 run[i]= zeros_left; | |
3960 | |
3961 coeff_num=-1; | |
3962 if(n > 24){ | |
3963 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
3964 int j; | |
3965 | |
3966 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
3967 j= scantable[ coeff_num ]; | |
3968 | |
3969 block[j]= level[i]; | |
3970 } | |
3971 }else{ | |
3972 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
3973 int j; | |
3974 | |
3975 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
3976 j= scantable[ coeff_num ]; | |
3977 | |
3978 block[j]= level[i] * qmul[j]; | |
3979 // printf("%d %d ", block[j], qmul[j]); | |
3980 } | |
3981 } | |
3982 return 0; | |
3983 } | |
3984 | |
3985 /** | |
2396 | 3986 * decodes a P_SKIP or B_SKIP macroblock |
3987 */ | |
3988 static void decode_mb_skip(H264Context *h){ | |
3989 MpegEncContext * const s = &h->s; | |
3990 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; | |
3991 int mb_type; | |
3992 | |
3993 memset(h->non_zero_count[mb_xy], 0, 16); | |
3994 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui | |
3995 | |
3996 if( h->slice_type == B_TYPE ) | |
3997 { | |
3998 // just for fill_caches. pred_direct_motion will set the real mb_type | |
3999 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP; | |
4000 //FIXME mbaff | |
4001 | |
2449 | 4002 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
2396 | 4003 pred_direct_motion(h, &mb_type); |
4004 if(h->pps.cabac){ | |
4005 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
4006 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
4007 } | |
4008 } | |
4009 else | |
4010 { | |
4011 int mx, my; | |
4012 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; | |
4013 | |
4014 if(h->sps.mb_aff && s->mb_skip_run==0 && (s->mb_y&1)==0){ | |
4015 h->mb_field_decoding_flag= get_bits1(&s->gb); | |
4016 } | |
4017 if(h->mb_field_decoding_flag) | |
4018 mb_type|= MB_TYPE_INTERLACED; | |
4019 | |
2449 | 4020 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
2396 | 4021 pred_pskip_motion(h, &mx, &my); |
4022 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
4023 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); | |
4024 if(h->pps.cabac) | |
4025 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
4026 } | |
4027 | |
4028 write_back_motion(h, mb_type); | |
4029 s->current_picture.mb_type[mb_xy]= mb_type|MB_TYPE_SKIP; | |
4030 s->current_picture.qscale_table[mb_xy]= s->qscale; | |
4031 h->slice_table[ mb_xy ]= h->slice_num; | |
4032 h->prev_mb_skiped= 1; | |
4033 } | |
4034 | |
4035 /** | |
1168 | 4036 * decodes a macroblock |
4037 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed | |
4038 */ | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4039 static int decode_mb_cavlc(H264Context *h){ |
1168 | 4040 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
|
4041 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1169 | 4042 int mb_type, partition_count, cbp; |
1168 | 4043 |
1252 | 4044 s->dsp.clear_blocks(h->mb); //FIXME avoid if allready clear (move after skip handlong? |
1168 | 4045 |
1170 | 4046 tprintf("pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
1453 | 4047 cbp = 0; /* avoid warning. FIXME: find a solution without slowing |
4048 down the code */ | |
1168 | 4049 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){ |
4050 if(s->mb_skip_run==-1) | |
4051 s->mb_skip_run= get_ue_golomb(&s->gb); | |
4052 | |
4053 if (s->mb_skip_run--) { | |
2396 | 4054 decode_mb_skip(h); |
1168 | 4055 return 0; |
4056 } | |
4057 } | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4058 if(h->sps.mb_aff && s->picture_structure==PICT_FRAME ){ |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4059 if ( ((s->mb_y&1) == 0) || h->prev_mb_skiped) |
1168 | 4060 h->mb_field_decoding_flag = get_bits1(&s->gb); |
4061 }else | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4062 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); |
1168 | 4063 |
4064 h->prev_mb_skiped= 0; | |
4065 | |
4066 mb_type= get_ue_golomb(&s->gb); | |
4067 if(h->slice_type == B_TYPE){ | |
4068 if(mb_type < 23){ | |
4069 partition_count= b_mb_type_info[mb_type].partition_count; | |
4070 mb_type= b_mb_type_info[mb_type].type; | |
4071 }else{ | |
4072 mb_type -= 23; | |
4073 goto decode_intra_mb; | |
4074 } | |
4075 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){ | |
4076 if(mb_type < 5){ | |
4077 partition_count= p_mb_type_info[mb_type].partition_count; | |
4078 mb_type= p_mb_type_info[mb_type].type; | |
4079 }else{ | |
4080 mb_type -= 5; | |
4081 goto decode_intra_mb; | |
4082 } | |
4083 }else{ | |
4084 assert(h->slice_type == I_TYPE); | |
4085 decode_intra_mb: | |
4086 if(mb_type > 25){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4087 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 | 4088 return -1; |
4089 } | |
4090 partition_count=0; | |
4091 cbp= i_mb_type_info[mb_type].cbp; | |
4092 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; | |
4093 mb_type= i_mb_type_info[mb_type].type; | |
4094 } | |
4095 | |
4096 if(h->mb_field_decoding_flag) | |
4097 mb_type |= MB_TYPE_INTERLACED; | |
4098 | |
4099 s->current_picture.mb_type[mb_xy]= mb_type; | |
4100 h->slice_table[ mb_xy ]= h->slice_num; | |
4101 | |
4102 if(IS_INTRA_PCM(mb_type)){ | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4103 unsigned int x, y; |
1168 | 4104 |
4105 // we assume these blocks are very rare so we dont optimize it | |
4106 align_get_bits(&s->gb); | |
4107 | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4108 // The pixels are stored in the same order as levels in h->mb array. |
1168 | 4109 for(y=0; y<16; y++){ |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4110 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3); |
1168 | 4111 for(x=0; x<16; x++){ |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4112 tprintf("LUMA ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8)); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4113 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= get_bits(&s->gb, 8); |
1168 | 4114 } |
4115 } | |
4116 for(y=0; y<8; y++){ | |
4117 const int index= 256 + 4*(y&3) + 32*(y>>2); | |
4118 for(x=0; x<8; x++){ | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4119 tprintf("CHROMA U ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8)); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4120 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
1168 | 4121 } |
4122 } | |
4123 for(y=0; y<8; y++){ | |
4124 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); | |
4125 for(x=0; x<8; x++){ | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4126 tprintf("CHROMA V ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8)); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4127 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
1168 | 4128 } |
4129 } | |
4130 | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4131 // In deblocking, the quantiser is 0 |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4132 s->current_picture.qscale_table[mb_xy]= 0; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4133 h->chroma_qp = get_chroma_qp(h, 0); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4134 // All coeffs are presents |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4135 memset(h->non_zero_count[mb_xy], 16, 16); |
1168 | 4136 |
4137 return 0; | |
4138 } | |
4139 | |
2449 | 4140 fill_caches(h, mb_type, 0); |
1168 | 4141 |
4142 //mb_pred | |
4143 if(IS_INTRA(mb_type)){ | |
4144 // init_top_left_availability(h); | |
4145 if(IS_INTRA4x4(mb_type)){ | |
4146 int i; | |
4147 | |
4148 // fill_intra4x4_pred_table(h); | |
4149 for(i=0; i<16; i++){ | |
4150 const int mode_coded= !get_bits1(&s->gb); | |
4151 const int predicted_mode= pred_intra_mode(h, i); | |
4152 int mode; | |
4153 | |
4154 if(mode_coded){ | |
4155 const int rem_mode= get_bits(&s->gb, 3); | |
4156 if(rem_mode<predicted_mode) | |
4157 mode= rem_mode; | |
4158 else | |
4159 mode= rem_mode + 1; | |
4160 }else{ | |
4161 mode= predicted_mode; | |
4162 } | |
4163 | |
4164 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode; | |
4165 } | |
4166 write_back_intra_pred_mode(h); | |
4167 if( check_intra4x4_pred_mode(h) < 0) | |
4168 return -1; | |
4169 }else{ | |
4170 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode); | |
4171 if(h->intra16x16_pred_mode < 0) | |
4172 return -1; | |
4173 } | |
4174 h->chroma_pred_mode= get_ue_golomb(&s->gb); | |
4175 | |
4176 h->chroma_pred_mode= check_intra_pred_mode(h, h->chroma_pred_mode); | |
4177 if(h->chroma_pred_mode < 0) | |
4178 return -1; | |
4179 }else if(partition_count==4){ | |
4180 int i, j, sub_partition_count[4], list, ref[2][4]; | |
4181 | |
4182 if(h->slice_type == B_TYPE){ | |
4183 for(i=0; i<4; i++){ | |
4184 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
4185 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
|
4186 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 | 4187 return -1; |
4188 } | |
4189 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
4190 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
4191 } | |
2396 | 4192 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1]) |
4193 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) | |
4194 pred_direct_motion(h, &mb_type); | |
1168 | 4195 }else{ |
4196 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ? | |
4197 for(i=0; i<4; i++){ | |
4198 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
4199 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
|
4200 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 | 4201 return -1; |
4202 } | |
4203 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
4204 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
4205 } | |
4206 } | |
4207 | |
4208 for(list=0; list<2; list++){ | |
4209 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; | |
4210 if(ref_count == 0) continue; | |
4211 for(i=0; i<4; i++){ | |
2396 | 4212 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
4213 if(IS_DIR(h->sub_mb_type[i], 0, list)){ | |
1168 | 4214 ref[list][i] = get_te0_golomb(&s->gb, ref_count); //FIXME init to 0 before and skip? |
4215 }else{ | |
4216 //FIXME | |
4217 ref[list][i] = -1; | |
4218 } | |
4219 } | |
4220 } | |
4221 | |
4222 for(list=0; list<2; list++){ | |
4223 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; | |
4224 if(ref_count == 0) continue; | |
4225 | |
4226 for(i=0; i<4; i++){ | |
2396 | 4227 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
1168 | 4228 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]= |
4229 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i]; | |
4230 | |
2396 | 4231 if(IS_DIR(h->sub_mb_type[i], 0, list)){ |
1168 | 4232 const int sub_mb_type= h->sub_mb_type[i]; |
4233 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1; | |
4234 for(j=0; j<sub_partition_count[i]; j++){ | |
4235 int mx, my; | |
4236 const int index= 4*i + block_width*j; | |
4237 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ]; | |
4238 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my); | |
4239 mx += get_se_golomb(&s->gb); | |
4240 my += get_se_golomb(&s->gb); | |
1170 | 4241 tprintf("final mv:%d %d\n", mx, my); |
4242 | |
1168 | 4243 if(IS_SUB_8X8(sub_mb_type)){ |
4244 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= | |
4245 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; | |
4246 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= | |
4247 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my; | |
4248 }else if(IS_SUB_8X4(sub_mb_type)){ | |
4249 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx; | |
4250 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my; | |
4251 }else if(IS_SUB_4X8(sub_mb_type)){ | |
4252 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx; | |
4253 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my; | |
4254 }else{ | |
4255 assert(IS_SUB_4X4(sub_mb_type)); | |
4256 mv_cache[ 0 ][0]= mx; | |
4257 mv_cache[ 0 ][1]= my; | |
4258 } | |
4259 } | |
4260 }else{ | |
4261 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0]; | |
4262 p[0] = p[1]= | |
4263 p[8] = p[9]= 0; | |
4264 } | |
4265 } | |
4266 } | |
2396 | 4267 }else if(IS_DIRECT(mb_type)){ |
4268 pred_direct_motion(h, &mb_type); | |
4269 s->current_picture.mb_type[mb_xy]= mb_type; | |
4270 }else{ | |
1168 | 4271 int list, mx, my, i; |
4272 //FIXME we should set ref_idx_l? to 0 if we use that later ... | |
4273 if(IS_16X16(mb_type)){ | |
4274 for(list=0; list<2; list++){ | |
2392 | 4275 if(h->ref_count[list]>0){ |
1168 | 4276 if(IS_DIR(mb_type, 0, list)){ |
4277 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
4278 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | |
2523 | 4279 }else |
4280 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (LIST_NOT_USED&0xFF), 1); | |
1168 | 4281 } |
4282 } | |
4283 for(list=0; list<2; list++){ | |
4284 if(IS_DIR(mb_type, 0, list)){ | |
4285 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); | |
4286 mx += get_se_golomb(&s->gb); | |
4287 my += get_se_golomb(&s->gb); | |
1170 | 4288 tprintf("final mv:%d %d\n", mx, my); |
4289 | |
1269 | 4290 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
2523 | 4291 }else |
4292 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4); | |
1168 | 4293 } |
4294 } | |
4295 else if(IS_16X8(mb_type)){ | |
4296 for(list=0; list<2; list++){ | |
4297 if(h->ref_count[list]>0){ | |
4298 for(i=0; i<2; i++){ | |
4299 if(IS_DIR(mb_type, i, list)){ | |
4300 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
4301 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); | |
2523 | 4302 }else |
2396 | 4303 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, (LIST_NOT_USED&0xFF), 1); |
1168 | 4304 } |
4305 } | |
4306 } | |
4307 for(list=0; list<2; list++){ | |
4308 for(i=0; i<2; i++){ | |
4309 if(IS_DIR(mb_type, i, list)){ | |
4310 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my); | |
4311 mx += get_se_golomb(&s->gb); | |
4312 my += get_se_golomb(&s->gb); | |
1170 | 4313 tprintf("final mv:%d %d\n", mx, my); |
4314 | |
1269 | 4315 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
2396 | 4316 }else |
4317 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); | |
1168 | 4318 } |
4319 } | |
4320 }else{ | |
4321 assert(IS_8X16(mb_type)); | |
4322 for(list=0; list<2; list++){ | |
4323 if(h->ref_count[list]>0){ | |
4324 for(i=0; i<2; i++){ | |
4325 if(IS_DIR(mb_type, i, list)){ //FIXME optimize | |
4326 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
4327 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); | |
2523 | 4328 }else |
2396 | 4329 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, (LIST_NOT_USED&0xFF), 1); |
1168 | 4330 } |
4331 } | |
4332 } | |
4333 for(list=0; list<2; list++){ | |
4334 for(i=0; i<2; i++){ | |
4335 if(IS_DIR(mb_type, i, list)){ | |
4336 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my); | |
4337 mx += get_se_golomb(&s->gb); | |
4338 my += get_se_golomb(&s->gb); | |
1170 | 4339 tprintf("final mv:%d %d\n", mx, my); |
4340 | |
1269 | 4341 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
2396 | 4342 }else |
4343 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); | |
1168 | 4344 } |
4345 } | |
4346 } | |
4347 } | |
4348 | |
4349 if(IS_INTER(mb_type)) | |
4350 write_back_motion(h, mb_type); | |
4351 | |
4352 if(!IS_INTRA16x16(mb_type)){ | |
4353 cbp= get_ue_golomb(&s->gb); | |
4354 if(cbp > 47){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4355 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%d) at %d %d\n", cbp, s->mb_x, s->mb_y); |
1168 | 4356 return -1; |
4357 } | |
4358 | |
4359 if(IS_INTRA4x4(mb_type)) | |
4360 cbp= golomb_to_intra4x4_cbp[cbp]; | |
4361 else | |
4362 cbp= golomb_to_inter_cbp[cbp]; | |
4363 } | |
4364 | |
4365 if(cbp || IS_INTRA16x16(mb_type)){ | |
4366 int i8x8, i4x4, chroma_idx; | |
4367 int chroma_qp, dquant; | |
4368 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr; | |
4369 const uint8_t *scan, *dc_scan; | |
4370 | |
4371 // fill_non_zero_count_cache(h); | |
4372 | |
4373 if(IS_INTERLACED(mb_type)){ | |
4374 scan= field_scan; | |
4375 dc_scan= luma_dc_field_scan; | |
4376 }else{ | |
4377 scan= zigzag_scan; | |
4378 dc_scan= luma_dc_zigzag_scan; | |
4379 } | |
4380 | |
4381 dquant= get_se_golomb(&s->gb); | |
4382 | |
4383 if( dquant > 25 || dquant < -26 ){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4384 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 | 4385 return -1; |
4386 } | |
4387 | |
4388 s->qscale += dquant; | |
4389 if(((unsigned)s->qscale) > 51){ | |
4390 if(s->qscale<0) s->qscale+= 52; | |
4391 else s->qscale-= 52; | |
4392 } | |
4393 | |
4394 h->chroma_qp= chroma_qp= get_chroma_qp(h, s->qscale); | |
4395 if(IS_INTRA16x16(mb_type)){ | |
4396 if( decode_residual(h, h->intra_gb_ptr, h->mb, LUMA_DC_BLOCK_INDEX, dc_scan, s->qscale, 16) < 0){ | |
4397 return -1; //FIXME continue if partotioned and other retirn -1 too | |
4398 } | |
4399 | |
4400 assert((cbp&15) == 0 || (cbp&15) == 15); | |
4401 | |
4402 if(cbp&15){ | |
4403 for(i8x8=0; i8x8<4; i8x8++){ | |
4404 for(i4x4=0; i4x4<4; i4x4++){ | |
4405 const int index= i4x4 + 4*i8x8; | |
4406 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, s->qscale, 15) < 0 ){ | |
4407 return -1; | |
4408 } | |
4409 } | |
4410 } | |
4411 }else{ | |
1636 | 4412 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1); |
1168 | 4413 } |
4414 }else{ | |
4415 for(i8x8=0; i8x8<4; i8x8++){ | |
4416 if(cbp & (1<<i8x8)){ | |
4417 for(i4x4=0; i4x4<4; i4x4++){ | |
4418 const int index= i4x4 + 4*i8x8; | |
4419 | |
4420 if( decode_residual(h, gb, h->mb + 16*index, index, scan, s->qscale, 16) <0 ){ | |
4421 return -1; | |
4422 } | |
4423 } | |
4424 }else{ | |
4425 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; | |
4426 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; | |
4427 } | |
4428 } | |
4429 } | |
4430 | |
4431 if(cbp&0x30){ | |
4432 for(chroma_idx=0; chroma_idx<2; chroma_idx++) | |
4433 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, chroma_qp, 4) < 0){ | |
4434 return -1; | |
4435 } | |
4436 } | |
4437 | |
4438 if(cbp&0x20){ | |
4439 for(chroma_idx=0; chroma_idx<2; chroma_idx++){ | |
4440 for(i4x4=0; i4x4<4; i4x4++){ | |
4441 const int index= 16 + 4*chroma_idx + i4x4; | |
4442 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, chroma_qp, 15) < 0){ | |
4443 return -1; | |
4444 } | |
4445 } | |
4446 } | |
4447 }else{ | |
4448 uint8_t * const nnz= &h->non_zero_count_cache[0]; | |
4449 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
4450 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
4451 } | |
4452 }else{ | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4453 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
|
4454 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
|
4455 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
|
4456 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; |
1168 | 4457 } |
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
|
4458 s->current_picture.qscale_table[mb_xy]= s->qscale; |
1168 | 4459 write_back_non_zero_count(h); |
4460 | |
4461 return 0; | |
4462 } | |
4463 | |
2312 | 4464 static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_slice) { |
4465 uint8_t *state= &h->cabac_state[ctx_base]; | |
4466 int mb_type; | |
4467 | |
4468 if(intra_slice){ | |
4469 MpegEncContext * const s = &h->s; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4470 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4471 const int mba_xy = mb_xy - 1; |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4472 const int mbb_xy = mb_xy - s->mb_stride; |
2312 | 4473 int ctx=0; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4474 if( h->slice_table[mba_xy] == h->slice_num && !IS_INTRA4x4( 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
|
4475 ctx++; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4476 if( h->slice_table[mbb_xy] == h->slice_num && !IS_INTRA4x4( 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
|
4477 ctx++; |
2312 | 4478 if( get_cabac( &h->cabac, &state[ctx] ) == 0 ) |
4479 return 0; /* I4x4 */ | |
4480 state += 2; | |
4481 }else{ | |
4482 if( get_cabac( &h->cabac, &state[0] ) == 0 ) | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4483 return 0; /* I4x4 */ |
2312 | 4484 } |
4485 | |
4486 if( get_cabac_terminate( &h->cabac ) ) | |
4487 return 25; /* PCM */ | |
4488 | |
4489 mb_type = 1; /* I16x16 */ | |
4490 if( get_cabac( &h->cabac, &state[1] ) ) | |
4491 mb_type += 12; /* cbp_luma != 0 */ | |
4492 | |
4493 if( get_cabac( &h->cabac, &state[2] ) ) { | |
4494 if( get_cabac( &h->cabac, &state[2+intra_slice] ) ) | |
4495 mb_type += 4 * 2; /* cbp_chroma == 2 */ | |
4496 else | |
4497 mb_type += 4 * 1; /* cbp_chroma == 1 */ | |
4498 } | |
4499 if( get_cabac( &h->cabac, &state[3+intra_slice] ) ) | |
4500 mb_type += 2; | |
4501 if( get_cabac( &h->cabac, &state[3+2*intra_slice] ) ) | |
4502 mb_type += 1; | |
4503 return mb_type; | |
4504 } | |
4505 | |
4506 static int decode_cabac_mb_type( H264Context *h ) { | |
4507 MpegEncContext * const s = &h->s; | |
4508 | |
4509 if( h->slice_type == I_TYPE ) { | |
4510 return decode_cabac_intra_mb_type(h, 3, 1); | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4511 } 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
|
4512 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
|
4513 /* 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
|
4514 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
|
4515 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
|
4516 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
|
4517 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4518 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
|
4519 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4520 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
|
4521 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
|
4522 else |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4523 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
|
4524 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4525 } else { |
2312 | 4526 return decode_cabac_intra_mb_type(h, 17, 0) + 5; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4527 } |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4528 } else if( h->slice_type == B_TYPE ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4529 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4530 const int mba_xy = mb_xy - 1; |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4531 const int mbb_xy = mb_xy - s->mb_stride; |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4532 int ctx = 0; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4533 int bits; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4534 |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4535 if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mba_xy] ) |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4536 && !IS_DIRECT( s->current_picture.mb_type[mba_xy] ) ) |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4537 ctx++; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4538 if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mbb_xy] ) |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4539 && !IS_DIRECT( s->current_picture.mb_type[mbb_xy] ) ) |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4540 ctx++; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4541 |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4542 if( !get_cabac( &h->cabac, &h->cabac_state[27+ctx] ) ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4543 return 0; /* B_Direct_16x16 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4544 |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4545 if( !get_cabac( &h->cabac, &h->cabac_state[27+3] ) ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4546 return 1 + get_cabac( &h->cabac, &h->cabac_state[27+5] ); /* B_L[01]_16x16 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4547 } |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4548 |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4549 bits = get_cabac( &h->cabac, &h->cabac_state[27+4] ) << 3; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4550 bits|= get_cabac( &h->cabac, &h->cabac_state[27+5] ) << 2; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4551 bits|= get_cabac( &h->cabac, &h->cabac_state[27+5] ) << 1; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4552 bits|= get_cabac( &h->cabac, &h->cabac_state[27+5] ); |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4553 if( bits < 8 ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4554 return bits + 3; /* B_Bi_16x16 through B_L1_L0_16x8 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4555 else if( bits == 13 ) { |
2312 | 4556 return decode_cabac_intra_mb_type(h, 32, 0) + 23; |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4557 } else if( bits == 14 ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4558 return 11; /* B_L1_L0_8x16 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4559 else if( bits == 15 ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4560 return 22; /* B_8x8 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4561 |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4562 bits= ( bits<<1 ) | get_cabac( &h->cabac, &h->cabac_state[27+5] ); |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4563 return bits - 4; /* B_L0_Bi_* through B_Bi_Bi_* */ |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4564 } else { |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4565 /* TODO SI/SP frames? */ |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4566 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
|
4567 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4568 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4569 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4570 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
|
4571 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
|
4572 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
|
4573 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
|
4574 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
|
4575 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
|
4576 |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4577 if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( 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
|
4578 ctx++; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4579 if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( 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
|
4580 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4581 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4582 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
|
4583 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
|
4584 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
|
4585 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
|
4586 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4587 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4588 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
|
4589 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
|
4590 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4591 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
|
4592 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
|
4593 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4594 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
|
4595 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
|
4596 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
|
4597 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
|
4598 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
|
4599 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
|
4600 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
|
4601 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
|
4602 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4603 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
|
4604 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4605 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4606 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
|
4607 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
|
4608 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
|
4609 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
|
4610 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
|
4611 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4612 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
|
4613 |
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
|
4614 /* No need to test for IS_INTRA4x4 and IS_INTRA16x16, as we set chroma_pred_mode_table to 0 */ |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4615 if( h->slice_table[mba_xy] == h->slice_num && 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
|
4616 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
|
4617 |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4618 if( h->slice_table[mbb_xy] == h->slice_num && 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
|
4619 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4620 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4621 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
|
4622 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
|
4623 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4624 if( 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
|
4625 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
|
4626 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
|
4627 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
|
4628 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4629 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
|
4630 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4631 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4632 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
|
4633 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
|
4634 }; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4635 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
|
4636 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
|
4637 }; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4638 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
|
4639 { 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
|
4640 { 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
|
4641 { 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
|
4642 { 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
|
4643 }; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4644 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4645 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
|
4646 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
|
4647 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
|
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 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
|
4650 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
|
4651 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4652 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
|
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 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
|
4655 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
|
4656 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
|
4657 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
|
4658 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
|
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 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
|
4661 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
|
4662 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4663 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
|
4664 mba_xy = mb_xy; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4665 else 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
|
4666 mba_xy = mb_xy - 1; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4667 if (h->slice_table[mba_xy] != h->slice_num) { |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4668 mba_xy = -1; |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4669 } |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4670 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4671 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4672 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
|
4673 mbb_xy = mb_xy; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4674 else 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
|
4675 mbb_xy = mb_xy - s->mb_stride; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4676 if (h->slice_table[mbb_xy] != h->slice_num) { |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4677 mbb_xy = -1; |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4678 } |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4679 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4680 |
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
|
4681 /* No need to test for skip as we put 0 for skip block */ |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4682 /* No need to test for IPCM as we put 1 for IPCM 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
|
4683 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
|
4684 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
|
4685 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
|
4686 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4687 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4688 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4689 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
|
4690 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
|
4691 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
|
4692 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
|
4693 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4694 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4695 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
|
4696 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
|
4697 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
|
4698 } |
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 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
|
4701 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4702 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
|
4703 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
|
4704 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
|
4705 |
2314 | 4706 cbp_a = (h->left_cbp>>4)&0x03; |
4707 cbp_b = (h-> top_cbp>>4)&0x03; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4708 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4709 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
|
4710 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
|
4711 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
|
4712 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
|
4713 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
|
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 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
|
4716 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
|
4717 if( cbp_b == 2 ) ctx += 2; |
2314 | 4718 return 1 + get_cabac( &h->cabac, &h->cabac_state[77 + ctx] ); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4719 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4720 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
|
4721 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
|
4722 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
|
4723 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
|
4724 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
|
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 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
|
4727 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
|
4728 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4729 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
|
4730 |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4731 if( h->last_qscale_diff != 0 && ( IS_INTRA16x16(s->current_picture.mb_type[mbn_xy] ) || (h->cbp_table[mbn_xy]&0x3f) ) ) |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4732 ctx++; |
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 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
|
4735 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
|
4736 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
|
4737 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4738 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
|
4739 val++; |
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 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4742 if( 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
|
4743 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
|
4744 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4745 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
|
4746 } |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4747 static int decode_cabac_p_mb_sub_type( H264Context *h ) { |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4748 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
|
4749 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
|
4750 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
|
4751 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
|
4752 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
|
4753 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
|
4754 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
|
4755 } |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4756 static int decode_cabac_b_mb_sub_type( H264Context *h ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4757 int type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4758 if( !get_cabac( &h->cabac, &h->cabac_state[36] ) ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4759 return 0; /* B_Direct_8x8 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4760 if( !get_cabac( &h->cabac, &h->cabac_state[37] ) ) |
2311
cdbb2f30e08b
small typo patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
2310
diff
changeset
|
4761 return 1 + get_cabac( &h->cabac, &h->cabac_state[39] ); /* B_L0_8x8, B_L1_8x8 */ |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4762 type = 3; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4763 if( get_cabac( &h->cabac, &h->cabac_state[38] ) ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4764 if( get_cabac( &h->cabac, &h->cabac_state[39] ) ) |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4765 return 11 + get_cabac( &h->cabac, &h->cabac_state[39] ); /* B_L1_4x4, B_Bi_4x4 */ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4766 type += 4; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4767 } |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4768 type += 2*get_cabac( &h->cabac, &h->cabac_state[39] ); |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4769 type += get_cabac( &h->cabac, &h->cabac_state[39] ); |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4770 return type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4771 } |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4772 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4773 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
|
4774 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
|
4775 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
|
4776 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
|
4777 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
|
4778 |
2396 | 4779 if( h->slice_type == B_TYPE) { |
4780 if( refa > 0 && !h->direct_cache[scan8[n] - 1] ) | |
4781 ctx++; | |
4782 if( refb > 0 && !h->direct_cache[scan8[n] - 8] ) | |
4783 ctx += 2; | |
4784 } else { | |
4785 if( refa > 0 ) | |
4786 ctx++; | |
4787 if( refb > 0 ) | |
4788 ctx += 2; | |
4789 } | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4790 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4791 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
|
4792 ref++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4793 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
|
4794 ctx = 4; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4795 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4796 ctx = 5; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4797 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4798 return ref; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4799 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4800 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4801 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
|
4802 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
|
4803 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
|
4804 int ctxbase = (l == 0) ? 40 : 47; |
2317 | 4805 int ctx, mvd; |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4806 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4807 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
|
4808 ctx = 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4809 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
|
4810 ctx = 2; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4811 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4812 ctx = 1; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4813 |
2317 | 4814 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx])) |
4815 return 0; | |
4816 | |
4817 mvd= 1; | |
4818 ctx= 3; | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4819 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
|
4820 mvd++; |
2317 | 4821 if( ctx < 6 ) |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4822 ctx++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4823 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4824 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4825 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
|
4826 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
|
4827 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
|
4828 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
|
4829 k++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4830 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4831 while( k-- ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4832 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
|
4833 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
|
4834 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4835 } |
2317 | 4836 if( get_cabac_bypass( &h->cabac ) ) return -mvd; |
4837 else return mvd; | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4838 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4839 |
2316 | 4840 static int inline get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { |
2314 | 4841 int nza, nzb; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4842 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
|
4843 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4844 if( cat == 0 ) { |
2314 | 4845 nza = h->left_cbp&0x100; |
4846 nzb = h-> top_cbp&0x100; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4847 } else if( cat == 1 || cat == 2 ) { |
2314 | 4848 nza = h->non_zero_count_cache[scan8[idx] - 1]; |
4849 nzb = h->non_zero_count_cache[scan8[idx] - 8]; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4850 } else if( cat == 3 ) { |
2314 | 4851 nza = (h->left_cbp>>(6+idx))&0x01; |
4852 nzb = (h-> top_cbp>>(6+idx))&0x01; | |
4853 } else { | |
4854 assert(cat == 4); | |
4855 nza = h->non_zero_count_cache[scan8[16+idx] - 1]; | |
4856 nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; | |
4857 } | |
4858 | |
4859 if( nza > 0 ) | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4860 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4861 |
2314 | 4862 if( nzb > 0 ) |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4863 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
|
4864 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4865 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
|
4866 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4867 |
2316 | 4868 static int inline decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, int qp, int max_coeff) { |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4869 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
|
4870 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
|
4871 static const int significant_coeff_flag_offset[5] = { 0, 15, 29, 44, 47 }; |
2313 | 4872 static const int coeff_abs_level_m1_offset[5] = {227+ 0, 227+10, 227+20, 227+30, 227+39 }; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4873 |
2313 | 4874 int index[16]; |
4875 | |
4876 int i, last; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4877 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
|
4878 |
2316 | 4879 int abslevel1 = 1; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4880 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
|
4881 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4882 /* 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
|
4883 * 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
|
4884 * 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
|
4885 * 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
|
4886 * 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
|
4887 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4888 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4889 /* 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
|
4890 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
|
4891 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
|
4892 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
|
4893 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
|
4894 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
|
4895 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4896 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
|
4897 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4898 |
2313 | 4899 for(last= 0; last < max_coeff - 1; last++) { |
4900 if( get_cabac( &h->cabac, &h->cabac_state[105+significant_coeff_flag_offset[cat]+last] )) { | |
4901 index[coeff_count++] = last; | |
4902 if( get_cabac( &h->cabac, &h->cabac_state[166+significant_coeff_flag_offset[cat]+last] ) ) { | |
4903 last= max_coeff; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4904 break; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4905 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4906 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4907 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4908 if( last == max_coeff -1 ) { |
2313 | 4909 index[coeff_count++] = last; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4910 } |
2316 | 4911 assert(coeff_count > 0); |
4912 | |
4913 if( cat == 0 ) | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4914 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
|
4915 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
|
4916 h->non_zero_count_cache[scan8[n]] = coeff_count; |
2316 | 4917 else if( cat == 3 ) |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4918 h->cbp_table[mb_xy] |= 0x40 << n; |
2316 | 4919 else { |
4920 assert( cat == 4 ); | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4921 h->non_zero_count_cache[scan8[16+n]] = coeff_count; |
2316 | 4922 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4923 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4924 for( i = coeff_count - 1; i >= 0; i-- ) { |
2316 | 4925 int ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + coeff_abs_level_m1_offset[cat]; |
4926 int j= scantable[index[i]]; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4927 |
2313 | 4928 if( get_cabac( &h->cabac, &h->cabac_state[ctx] ) == 0 ) { |
2316 | 4929 if( cat == 0 || cat == 3 ) { |
4930 if( get_cabac_bypass( &h->cabac ) ) block[j] = -1; | |
4931 else block[j] = 1; | |
4932 }else{ | |
4933 if( get_cabac_bypass( &h->cabac ) ) block[j] = -qmul[j]; | |
4934 else block[j] = qmul[j]; | |
4935 } | |
2313 | 4936 |
4937 abslevel1++; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4938 } else { |
2313 | 4939 int coeff_abs = 2; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4940 ctx = 5 + FFMIN( 4, abslevelgt1 ) + coeff_abs_level_m1_offset[cat]; |
2313 | 4941 while( coeff_abs < 15 && get_cabac( &h->cabac, &h->cabac_state[ctx] ) ) { |
4942 coeff_abs++; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4943 } |
2313 | 4944 |
4945 if( coeff_abs >= 15 ) { | |
4946 int j = 0; | |
4947 while( get_cabac_bypass( &h->cabac ) ) { | |
4948 coeff_abs += 1 << j; | |
4949 j++; | |
4950 } | |
4951 | |
4952 while( j-- ) { | |
4953 if( get_cabac_bypass( &h->cabac ) ) | |
4954 coeff_abs += 1 << j ; | |
4955 } | |
4956 } | |
4957 | |
2316 | 4958 if( cat == 0 || cat == 3 ) { |
4959 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs; | |
4960 else block[j] = coeff_abs; | |
4961 }else{ | |
4962 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs * qmul[j]; | |
4963 else block[j] = coeff_abs * qmul[j]; | |
4964 } | |
2313 | 4965 |
4966 abslevelgt1++; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4967 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4968 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4969 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
|
4970 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4971 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4972 /** |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4973 * 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
|
4974 * @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
|
4975 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4976 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
|
4977 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
|
4978 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
|
4979 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
|
4980 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4981 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
|
4982 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4983 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
|
4984 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
|
4985 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
|
4986 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4987 |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
4988 tprintf("pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4989 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
|
4990 /* 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
|
4991 if( decode_cabac_mb_skip( h ) ) { |
2396 | 4992 decode_mb_skip(h); |
4993 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4994 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
|
4995 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
|
4996 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
|
4997 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4998 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
|
4999 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5000 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5001 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5002 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
|
5003 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5004 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
|
5005 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
|
5006 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
|
5007 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5008 |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5009 if( h->slice_type == B_TYPE ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5010 if( mb_type < 23 ){ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5011 partition_count= b_mb_type_info[mb_type].partition_count; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5012 mb_type= b_mb_type_info[mb_type].type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5013 }else{ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5014 mb_type -= 23; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5015 goto decode_intra_mb; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5016 } |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5017 } else if( h->slice_type == P_TYPE ) { |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5018 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
|
5019 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
|
5020 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
|
5021 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5022 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
|
5023 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
|
5024 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5025 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5026 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
|
5027 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
|
5028 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
|
5029 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
|
5030 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
|
5031 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
|
5032 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5033 #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
|
5034 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
|
5035 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
|
5036 #endif |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5037 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5038 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
|
5039 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
|
5040 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5041 if(IS_INTRA_PCM(mb_type)) { |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5042 const uint8_t *ptr; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5043 unsigned int x, y; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5044 |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5045 // We assume these blocks are very rare so we dont optimize it. |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5046 // FIXME The two following lines get the bitstream position in the cabac |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5047 // decode, I think it should be done by a function in cabac.h (or cabac.c). |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5048 ptr= h->cabac.bytestream; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5049 if (h->cabac.low&0x1) ptr-=CABAC_BITS/8; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5050 |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5051 // The pixels are stored in the same order as levels in h->mb array. |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5052 for(y=0; y<16; y++){ |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5053 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5054 for(x=0; x<16; x++){ |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5055 tprintf("LUMA ICPM LEVEL (%3d)\n", *ptr); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5056 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= *ptr++; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5057 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5058 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5059 for(y=0; y<8; y++){ |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5060 const int index= 256 + 4*(y&3) + 32*(y>>2); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5061 for(x=0; x<8; x++){ |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5062 tprintf("CHROMA U ICPM LEVEL (%3d)\n", *ptr); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5063 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5064 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5065 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5066 for(y=0; y<8; y++){ |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5067 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5068 for(x=0; x<8; x++){ |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5069 tprintf("CHROMA V ICPM LEVEL (%3d)\n", *ptr); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5070 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5071 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5072 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5073 |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5074 ff_init_cabac_decoder(&h->cabac, ptr, h->cabac.bytestream_end - ptr); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5075 |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5076 // All blocks are presents |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5077 h->cbp_table[mb_xy] = 0x1ef; |
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
|
5078 h->chroma_pred_mode_table[mb_xy] = 0; |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5079 // In deblocking, the quantiser is 0 |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5080 s->current_picture.qscale_table[mb_xy]= 0; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5081 h->chroma_qp = get_chroma_qp(h, 0); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5082 // All coeffs are presents |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5083 memset(h->non_zero_count[mb_xy], 16, 16); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5084 return 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
|
5085 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5086 |
2449 | 5087 fill_caches(h, mb_type, 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
|
5088 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5089 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
|
5090 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
|
5091 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
|
5092 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
|
5093 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
|
5094 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
|
5095 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5096 //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
|
5097 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5098 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
|
5099 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
|
5100 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5101 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
|
5102 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
|
5103 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5104 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
|
5105 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
|
5106 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5107 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
|
5108 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
|
5109 } 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
|
5110 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
|
5111 |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5112 if( h->slice_type == B_TYPE ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5113 for( i = 0; i < 4; i++ ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5114 h->sub_mb_type[i] = decode_cabac_b_mb_sub_type( h ); |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5115 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5116 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5117 } |
2396 | 5118 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1]) |
5119 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) { | |
5120 pred_direct_motion(h, &mb_type); | |
5121 if( h->ref_count[0] > 1 || h->ref_count[1] > 1 ) { | |
5122 for( i = 0; i < 4; i++ ) | |
5123 if( IS_DIRECT(h->sub_mb_type[i]) ) | |
5124 fill_rectangle( &h->direct_cache[scan8[4*i]], 2, 2, 8, 1, 1 ); | |
5125 } | |
5126 } | |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5127 } else { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5128 for( i = 0; i < 4; i++ ) { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5129 h->sub_mb_type[i] = decode_cabac_p_mb_sub_type( h ); |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5130 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5131 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5132 } |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5133 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5134 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5135 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
|
5136 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
|
5137 for( i = 0; i < 4; i++ ) { |
2396 | 5138 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
5139 if(IS_DIR(h->sub_mb_type[i], 0, list)){ | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5140 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
|
5141 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
|
5142 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5143 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
|
5144 } else { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5145 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
|
5146 } |
2110 | 5147 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
|
5148 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
|
5149 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5150 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5151 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5152 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5153 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
|
5154 for(i=0; i<4; i++){ |
2396 | 5155 if(IS_DIRECT(h->sub_mb_type[i])){ |
5156 fill_rectangle(h->mvd_cache[list][scan8[4*i]], 2, 2, 8, 0, 4); | |
5157 continue; | |
5158 } | |
2110 | 5159 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
|
5160 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5161 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
|
5162 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
|
5163 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
|
5164 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
|
5165 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
|
5166 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
|
5167 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
|
5168 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
|
5169 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
|
5170 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
|
5171 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5172 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
|
5173 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
|
5174 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
|
5175 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5176 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
|
5177 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
|
5178 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
|
5179 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
|
5180 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
|
5181 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5182 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
|
5183 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
|
5184 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
|
5185 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
|
5186 }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
|
5187 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
|
5188 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
|
5189 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5190 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
|
5191 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
|
5192 }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
|
5193 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
|
5194 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
|
5195 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5196 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
|
5197 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
|
5198 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5199 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
|
5200 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
|
5201 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
|
5202 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5203 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
|
5204 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
|
5205 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5206 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5207 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5208 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
|
5209 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
|
5210 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
|
5211 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
|
5212 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5213 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5214 } |
2396 | 5215 } else if( IS_DIRECT(mb_type) ) { |
5216 pred_direct_motion(h, &mb_type); | |
5217 s->current_picture.mb_type[mb_xy]= mb_type; | |
5218 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
5219 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
5220 } else { | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5221 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
|
5222 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
|
5223 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
|
5224 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
|
5225 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
|
5226 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
|
5227 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
|
5228 } |
2523 | 5229 }else |
5230 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1); | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5231 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5232 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
|
5233 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
|
5234 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
|
5235 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5236 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
|
5237 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
|
5238 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
|
5239 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5240 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
|
5241 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
2523 | 5242 }else |
5243 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4); | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5244 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5245 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5246 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
|
5247 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
|
5248 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
|
5249 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
|
5250 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
|
5251 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
|
5252 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, ref, 1); |
2396 | 5253 }else |
5254 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, (LIST_NOT_USED&0xFF), 1); | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5255 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5256 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5257 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5258 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
|
5259 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
|
5260 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
|
5261 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
|
5262 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
|
5263 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
|
5264 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
|
5265 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5266 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
|
5267 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
2523 | 5268 }else{ |
2396 | 5269 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); |
5270 fill_rectangle(h-> mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5271 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5272 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5273 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5274 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5275 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
|
5276 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
|
5277 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
|
5278 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
|
5279 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
|
5280 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
|
5281 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, ref, 1); |
2396 | 5282 }else |
5283 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, (LIST_NOT_USED&0xFF), 1); | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5284 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5285 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5286 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5287 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
|
5288 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
|
5289 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
|
5290 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
|
5291 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
|
5292 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
|
5293 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5294 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
|
5295 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
|
5296 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
2523 | 5297 }else{ |
2396 | 5298 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); |
5299 fill_rectangle(h-> mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5300 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5301 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5302 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5303 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5304 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5305 |
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
|
5306 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
|
5307 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
|
5308 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
|
5309 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5310 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5311 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
|
5312 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
|
5313 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
|
5314 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5315 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5316 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
|
5317 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5318 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
|
5319 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
|
5320 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
|
5321 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5322 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
|
5323 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
|
5324 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
|
5325 }else{ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5326 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
|
5327 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
|
5328 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5329 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5330 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
|
5331 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
|
5332 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
|
5333 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
|
5334 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
|
5335 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5336 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
|
5337 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5338 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
|
5339 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
|
5340 //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
|
5341 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
|
5342 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
|
5343 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
|
5344 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
|
5345 //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
|
5346 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
|
5347 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
|
5348 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5349 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5350 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
|
5351 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5352 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5353 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
|
5354 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
|
5355 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
|
5356 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
|
5357 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
|
5358 //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
|
5359 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
|
5360 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
|
5361 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5362 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5363 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
|
5364 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
|
5365 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5366 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5367 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5368 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5369 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
|
5370 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
|
5371 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
|
5372 //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
|
5373 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
|
5374 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
|
5375 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5376 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5377 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5378 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
|
5379 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
|
5380 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
|
5381 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
|
5382 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
|
5383 //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
|
5384 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
|
5385 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
|
5386 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5387 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5388 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5389 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
|
5390 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
|
5391 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
|
5392 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5393 } else { |
2315 | 5394 uint8_t * const nnz= &h->non_zero_count_cache[0]; |
5395 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1); | |
5396 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
5397 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5398 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5399 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5400 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
|
5401 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
|
5402 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5403 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
|
5404 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5405 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5406 |
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
|
5407 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
|
5408 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
|
5409 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
|
5410 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
|
5411 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
|
5412 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5413 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
|
5414 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
|
5415 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
|
5416 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
|
5417 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5418 |
1898 | 5419 if( bS[i] < 4 ) { |
5420 const int tc0 = tc0_table[index_a][bS[i] - 1]; | |
5421 /* 4px edge length */ | |
5422 for( d = 0; d < 4; d++ ) { | |
5423 const int p0 = pix[-1]; | |
5424 const int p1 = pix[-2]; | |
5425 const int p2 = pix[-3]; | |
5426 const int q0 = pix[0]; | |
5427 const int q1 = pix[1]; | |
5428 const int q2 = pix[2]; | |
5429 | |
5430 if( ABS( p0 - q0 ) < alpha && | |
5431 ABS( p1 - p0 ) < beta && | |
5432 ABS( q1 - q0 ) < beta ) { | |
5433 int tc = tc0; | |
5434 int i_delta; | |
5435 | |
5436 if( ABS( p2 - p0 ) < beta ) { | |
5437 pix[-2] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); | |
5438 tc++; | |
5439 } | |
5440 if( ABS( q2 - q0 ) < beta ) { | |
5441 pix[1] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); | |
5442 tc++; | |
5443 } | |
5444 | |
5445 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
5446 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ | |
5447 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
|
5448 } |
1898 | 5449 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
|
5450 } |
1898 | 5451 }else{ |
5452 /* 4px edge length */ | |
5453 for( d = 0; d < 4; d++ ) { | |
5454 const int p0 = pix[-1]; | |
5455 const int p1 = pix[-2]; | |
5456 const int p2 = pix[-3]; | |
5457 | |
5458 const int q0 = pix[0]; | |
5459 const int q1 = pix[1]; | |
5460 const int q2 = pix[2]; | |
5461 | |
5462 if( ABS( p0 - q0 ) < alpha && | |
5463 ABS( p1 - p0 ) < beta && | |
5464 ABS( q1 - q0 ) < beta ) { | |
5465 | |
5466 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
5467 if( ABS( p2 - p0 ) < beta) | |
5468 { | |
5469 const int p3 = pix[-4]; | |
5470 /* p0', p1', p2' */ | |
5471 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
5472 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
5473 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
5474 } else { | |
5475 /* p0' */ | |
5476 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
5477 } | |
5478 if( ABS( q2 - q0 ) < beta) | |
5479 { | |
5480 const int q3 = pix[3]; | |
5481 /* q0', q1', q2' */ | |
5482 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
5483 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
5484 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
5485 } else { | |
5486 /* q0' */ | |
5487 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
5488 } | |
5489 }else{ | |
5490 /* p0', q0' */ | |
5491 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
5492 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
5493 } | |
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
|
5494 } |
1898 | 5495 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
|
5496 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5497 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5498 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5499 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5500 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
|
5501 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
|
5502 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
|
5503 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
|
5504 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
|
5505 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5506 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
|
5507 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
|
5508 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
|
5509 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
|
5510 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5511 |
1898 | 5512 if( bS[i] < 4 ) { |
5513 const int tc = tc0_table[index_a][bS[i] - 1] + 1; | |
5514 /* 2px edge length (because we use same bS than the one for luma) */ | |
5515 for( d = 0; d < 2; d++ ){ | |
5516 const int p0 = pix[-1]; | |
5517 const int p1 = pix[-2]; | |
5518 const int q0 = pix[0]; | |
5519 const int q1 = pix[1]; | |
5520 | |
5521 if( ABS( p0 - q0 ) < alpha && | |
5522 ABS( p1 - p0 ) < beta && | |
5523 ABS( q1 - q0 ) < beta ) { | |
5524 const int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
5525 | |
5526 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ | |
5527 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
5528 //tprintf("filter_mb_edgecv i:%d d:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, qp, index_a, alpha, beta, tc, bS[i], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1); |
1898 | 5529 } |
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
|
5530 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
|
5531 } |
1898 | 5532 }else{ |
5533 /* 2px edge length (because we use same bS than the one for luma) */ | |
5534 for( d = 0; d < 2; d++ ){ | |
5535 const int p0 = pix[-1]; | |
5536 const int p1 = pix[-2]; | |
5537 const int q0 = pix[0]; | |
5538 const int q1 = pix[1]; | |
5539 | |
5540 if( ABS( p0 - q0 ) < alpha && | |
5541 ABS( p1 - p0 ) < beta && | |
5542 ABS( q1 - q0 ) < beta ) { | |
5543 | |
5544 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */ | |
5545 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ | |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
5546 //tprintf("filter_mb_edgecv i:%d d:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1); |
1898 | 5547 } |
5548 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
|
5549 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5550 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5551 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5552 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5553 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5554 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
|
5555 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
|
5556 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
|
5557 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
|
5558 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
|
5559 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
|
5560 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5561 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
|
5562 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
|
5563 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
|
5564 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
|
5565 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5566 |
1898 | 5567 if( bS[i] < 4 ) { |
5568 const int tc0 = tc0_table[index_a][bS[i] - 1]; | |
5569 /* 4px edge length */ | |
5570 for( d = 0; d < 4; d++ ) { | |
5571 const int p0 = pix[-1*pix_next]; | |
5572 const int p1 = pix[-2*pix_next]; | |
5573 const int p2 = pix[-3*pix_next]; | |
5574 const int q0 = pix[0]; | |
5575 const int q1 = pix[1*pix_next]; | |
5576 const int q2 = pix[2*pix_next]; | |
5577 | |
5578 if( ABS( p0 - q0 ) < alpha && | |
5579 ABS( p1 - p0 ) < beta && | |
5580 ABS( q1 - q0 ) < beta ) { | |
5581 | |
5582 int tc = tc0; | |
5583 int i_delta; | |
5584 | |
5585 if( ABS( p2 - p0 ) < beta ) { | |
5586 pix[-2*pix_next] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); | |
5587 tc++; | |
5588 } | |
5589 if( ABS( q2 - q0 ) < beta ) { | |
5590 pix[pix_next] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); | |
5591 tc++; | |
5592 } | |
5593 | |
5594 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
5595 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */ | |
5596 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
|
5597 } |
1898 | 5598 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
|
5599 } |
1898 | 5600 }else{ |
5601 /* 4px edge length */ | |
5602 for( d = 0; d < 4; d++ ) { | |
5603 const int p0 = pix[-1*pix_next]; | |
5604 const int p1 = pix[-2*pix_next]; | |
5605 const int p2 = pix[-3*pix_next]; | |
5606 const int q0 = pix[0]; | |
5607 const int q1 = pix[1*pix_next]; | |
5608 const int q2 = pix[2*pix_next]; | |
5609 | |
5610 if( ABS( p0 - q0 ) < alpha && | |
5611 ABS( p1 - p0 ) < beta && | |
5612 ABS( q1 - q0 ) < beta ) { | |
5613 | |
5614 const int p3 = pix[-4*pix_next]; | |
5615 const int q3 = pix[ 3*pix_next]; | |
5616 | |
5617 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
5618 if( ABS( p2 - p0 ) < beta) { | |
5619 /* p0', p1', p2' */ | |
5620 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
5621 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
5622 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
5623 } else { | |
5624 /* p0' */ | |
5625 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
5626 } | |
5627 if( ABS( q2 - q0 ) < beta) { | |
5628 /* q0', q1', q2' */ | |
5629 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
5630 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
5631 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
5632 } else { | |
5633 /* q0' */ | |
5634 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
5635 } | |
5636 }else{ | |
5637 /* p0', q0' */ | |
5638 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
5639 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
5640 } | |
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
|
5641 } |
1898 | 5642 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
|
5643 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5644 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5645 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5646 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5647 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5648 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
|
5649 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
|
5650 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
|
5651 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
|
5652 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
|
5653 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
|
5654 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5655 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
|
5656 { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5657 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
|
5658 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
|
5659 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
|
5660 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5661 |
1898 | 5662 if( bS[i] < 4 ) { |
5663 int tc = tc0_table[index_a][bS[i] - 1] + 1; | |
5664 /* 2px edge length (see deblocking_filter_edgecv) */ | |
5665 for( d = 0; d < 2; d++ ) { | |
5666 const int p0 = pix[-1*pix_next]; | |
5667 const int p1 = pix[-2*pix_next]; | |
5668 const int q0 = pix[0]; | |
5669 const int q1 = pix[1*pix_next]; | |
5670 | |
5671 if( ABS( p0 - q0 ) < alpha && | |
5672 ABS( p1 - p0 ) < beta && | |
5673 ABS( q1 - q0 ) < beta ) { | |
5674 | |
5675 int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
5676 | |
5677 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */ | |
5678 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
5679 } | |
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
|
5680 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
|
5681 } |
1898 | 5682 }else{ |
5683 /* 2px edge length (see deblocking_filter_edgecv) */ | |
5684 for( d = 0; d < 2; d++ ) { | |
5685 const int p0 = pix[-1*pix_next]; | |
5686 const int p1 = pix[-2*pix_next]; | |
5687 const int q0 = pix[0]; | |
5688 const int q1 = pix[1*pix_next]; | |
5689 | |
5690 if( ABS( p0 - q0 ) < alpha && | |
5691 ABS( p1 - p0 ) < beta && | |
5692 ABS( q1 - q0 ) < beta ) { | |
5693 | |
5694 pix[-pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */ | |
5695 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ | |
5696 } | |
5697 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
|
5698 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5699 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5700 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5701 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5702 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5703 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
|
5704 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
|
5705 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
|
5706 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
|
5707 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
|
5708 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5709 /* 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
|
5710 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
|
5711 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
|
5712 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5713 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
|
5714 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
|
5715 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5716 /* 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
|
5717 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
|
5718 { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5719 int edge; |
2454 | 5720 const int mbm_xy = dir == 0 ? mb_xy -1 : mb_xy - s->mb_stride; |
5721 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0; | |
5722 | |
5723 if (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_table[mb_xy]) | |
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
|
5724 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
|
5725 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5726 /* 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
|
5727 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
|
5728 /* mbn_xy: neighbour macroblock (how that works for field ?) */ |
2454 | 5729 int mbn_xy = edge > 0 ? mb_xy : mbm_xy; |
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
|
5730 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
|
5731 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
|
5732 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5733 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
|
5734 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
|
5735 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
|
5736 } 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
|
5737 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
|
5738 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
|
5739 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
|
5740 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
|
5741 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
|
5742 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
|
5743 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5744 if( h->non_zero_count_cache[b_idx] != 0 || |
2449 | 5745 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
|
5746 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
|
5747 } |
2523 | 5748 else |
5749 { | |
5750 /* FIXME: A given frame may occupy more than one position in | |
5751 * the reference list. So we should compare the frame numbers, | |
5752 * not the indices in the ref list. */ | |
5753 int l; | |
5754 bS[i] = 0; | |
5755 for( l = 0; l < 1 + (h->slice_type == B_TYPE); l++ ) { | |
5756 if( h->ref_cache[l][b_idx] != h->ref_cache[l][bn_idx] || | |
5757 ABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || | |
5758 ABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= 4 ) { | |
5759 bS[i] = 1; | |
5760 break; | |
5761 } | |
5762 } | |
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
|
5763 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5764 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5765 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5766 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
|
5767 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
|
5768 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5769 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5770 /* Filter edge */ |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5771 // Do not use s->qscale as luma quantiser because it has not the same |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5772 // value in IPCM macroblocks. |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5773 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1; |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
5774 //tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d, QPc:%d, QPcn:%d\n", mb_x, mb_y, dir, edge, qp, h->chroma_qp, s->current_picture.qscale_table[mbn_xy]); |
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
|
5775 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
|
5776 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp ); |
1898 | 5777 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
|
5778 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
|
5779 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
|
5780 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
|
5781 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
|
5782 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5783 } 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
|
5784 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp ); |
1898 | 5785 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
|
5786 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
|
5787 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
|
5788 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
|
5789 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
|
5790 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5791 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5792 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5793 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5794 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5795 |
1168 | 5796 static int decode_slice(H264Context *h){ |
5797 MpegEncContext * const s = &h->s; | |
5798 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; | |
5799 | |
5800 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
|
5801 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5802 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
|
5803 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
|
5804 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5805 /* realign */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5806 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
|
5807 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5808 /* 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
|
5809 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
|
5810 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
|
5811 s->gb.buffer + get_bits_count(&s->gb)/8, |
2116 | 5812 ( 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
|
5813 /* 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
|
5814 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
|
5815 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
|
5816 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
|
5817 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
|
5818 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5819 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
|
5820 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5821 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
|
5822 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
|
5823 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5824 h->cabac_state[i] = 2 * ( pre - 64 ) + 1; |
1168 | 5825 } |
5826 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5827 for(;;){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5828 int ret = decode_mb_cabac(h); |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5829 int eos; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5830 |
2163 | 5831 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
|
5832 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5833 /* 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
|
5834 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
|
5835 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
|
5836 |
2163 | 5837 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
|
5838 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5839 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
|
5840 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
|
5841 } |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5842 eos = get_cabac_terminate( &h->cabac ); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5843 |
2116 | 5844 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
|
5845 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
|
5846 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
|
5847 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
|
5848 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5849 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5850 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
|
5851 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
|
5852 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
2392 | 5853 ++s->mb_y; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5854 if(h->sps.mb_aff && s->picture_structure==PICT_FRAME ) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5855 ++s->mb_y; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5856 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5857 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5858 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5859 if( eos || s->mb_y >= s->mb_height ) { |
2392 | 5860 tprintf("slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5861 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
|
5862 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
|
5863 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5864 #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
|
5865 /* 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
|
5866 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
|
5867 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
|
5868 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
|
5869 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5870 #endif |
1168 | 5871 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5872 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5873 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5874 for(;;){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5875 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
|
5876 |
2163 | 5877 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
|
5878 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5879 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
|
5880 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
|
5881 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
|
5882 |
2163 | 5883 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
|
5884 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
|
5885 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5886 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5887 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
|
5888 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
|
5889 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
|
5890 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5891 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
|
5892 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5893 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5894 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
|
5895 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
|
5896 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5897 ++s->mb_y; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5898 if(h->sps.mb_aff && s->picture_structure==PICT_FRAME ) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5899 ++s->mb_y; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5900 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5901 if(s->mb_y >= s->mb_height){ |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5902 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
|
5903 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5904 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
|
5905 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
|
5906 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5907 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
|
5908 }else{ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5909 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
|
5910 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5911 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
|
5912 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5913 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5914 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5915 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5916 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){ |
2392 | 5917 tprintf("slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5918 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){ |
1168 | 5919 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); |
5920 | |
5921 return 0; | |
5922 }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
|
5923 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 | 5924 |
5925 return -1; | |
5926 } | |
5927 } | |
5928 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5929 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5930 |
1168 | 5931 #if 0 |
5932 for(;s->mb_y < s->mb_height; s->mb_y++){ | |
5933 for(;s->mb_x < s->mb_width; s->mb_x++){ | |
5934 int ret= decode_mb(h); | |
5935 | |
5936 hl_decode_mb(h); | |
5937 | |
5938 if(ret<0){ | |
5939 fprintf(stderr, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); | |
5940 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); | |
5941 | |
5942 return -1; | |
5943 } | |
5944 | |
5945 if(++s->mb_x >= s->mb_width){ | |
5946 s->mb_x=0; | |
5947 if(++s->mb_y >= s->mb_height){ | |
5948 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
5949 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); | |
5950 | |
5951 return 0; | |
5952 }else{ | |
5953 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); | |
5954 | |
5955 return -1; | |
5956 } | |
5957 } | |
5958 } | |
5959 | |
5960 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){ | |
5961 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
5962 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); | |
5963 | |
5964 return 0; | |
5965 }else{ | |
5966 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); | |
5967 | |
5968 return -1; | |
5969 } | |
5970 } | |
5971 } | |
5972 s->mb_x=0; | |
5973 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
5974 } | |
5975 #endif | |
5976 return -1; //not reached | |
5977 } | |
5978 | |
5979 static inline int decode_vui_parameters(H264Context *h, SPS *sps){ | |
5980 MpegEncContext * const s = &h->s; | |
5981 int aspect_ratio_info_present_flag, aspect_ratio_idc; | |
5982 | |
5983 aspect_ratio_info_present_flag= get_bits1(&s->gb); | |
5984 | |
5985 if( aspect_ratio_info_present_flag ) { | |
5986 aspect_ratio_idc= get_bits(&s->gb, 8); | |
5987 if( aspect_ratio_idc == EXTENDED_SAR ) { | |
1548 | 5988 sps->sar.num= get_bits(&s->gb, 16); |
5989 sps->sar.den= get_bits(&s->gb, 16); | |
1168 | 5990 }else if(aspect_ratio_idc < 16){ |
1548 | 5991 sps->sar= pixel_aspect[aspect_ratio_idc]; |
1168 | 5992 }else{ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5993 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n"); |
1168 | 5994 return -1; |
5995 } | |
5996 }else{ | |
1548 | 5997 sps->sar.num= |
5998 sps->sar.den= 0; | |
1168 | 5999 } |
6000 // 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
|
6001 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
6002 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
|
6003 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
|
6004 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
6005 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
6006 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
|
6007 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
|
6008 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
|
6009 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
|
6010 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
|
6011 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
|
6012 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
|
6013 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
6014 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
6015 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
6016 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
|
6017 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
|
6018 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
|
6019 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
6020 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
6021 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
|
6022 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
|
6023 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
|
6024 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
|
6025 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
|
6026 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
6027 |
1168 | 6028 #if 0 |
6029 | nal_hrd_parameters_present_flag |0 |u(1) | | |
6030 | if( nal_hrd_parameters_present_flag = = 1) | | | | |
6031 | hrd_parameters( ) | | | | |
6032 | vcl_hrd_parameters_present_flag |0 |u(1) | | |
6033 | if( vcl_hrd_parameters_present_flag = = 1) | | | | |
6034 | hrd_parameters( ) | | | | |
6035 | if( ( nal_hrd_parameters_present_flag = = 1 | || | | | |
6036 | | | | | |
6037 |( vcl_hrd_parameters_present_flag = = 1 ) ) | | | | |
6038 | low_delay_hrd_flag |0 |u(1) | | |
6039 | bitstream_restriction_flag |0 |u(1) | | |
6040 | if( bitstream_restriction_flag ) { |0 |u(1) | | |
6041 | motion_vectors_over_pic_boundaries_flag |0 |u(1) | | |
6042 | max_bytes_per_pic_denom |0 |ue(v) | | |
6043 | max_bits_per_mb_denom |0 |ue(v) | | |
6044 | log2_max_mv_length_horizontal |0 |ue(v) | | |
6045 | log2_max_mv_length_vertical |0 |ue(v) | | |
6046 | num_reorder_frames |0 |ue(v) | | |
6047 | max_dec_frame_buffering |0 |ue(v) | | |
6048 | } | | | | |
6049 |} | | | | |
6050 #endif | |
6051 return 0; | |
6052 } | |
6053 | |
6054 static inline int decode_seq_parameter_set(H264Context *h){ | |
6055 MpegEncContext * const s = &h->s; | |
1371 | 6056 int profile_idc, level_idc; |
1168 | 6057 int sps_id, i; |
6058 SPS *sps; | |
6059 | |
6060 profile_idc= get_bits(&s->gb, 8); | |
1371 | 6061 get_bits1(&s->gb); //constraint_set0_flag |
6062 get_bits1(&s->gb); //constraint_set1_flag | |
6063 get_bits1(&s->gb); //constraint_set2_flag | |
2312 | 6064 get_bits1(&s->gb); //constraint_set3_flag |
6065 get_bits(&s->gb, 4); // reserved | |
1168 | 6066 level_idc= get_bits(&s->gb, 8); |
6067 sps_id= get_ue_golomb(&s->gb); | |
6068 | |
6069 sps= &h->sps_buffer[ sps_id ]; | |
6070 sps->profile_idc= profile_idc; | |
6071 sps->level_idc= level_idc; | |
2312 | 6072 |
1168 | 6073 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4; |
6074 sps->poc_type= get_ue_golomb(&s->gb); | |
6075 | |
6076 if(sps->poc_type == 0){ //FIXME #define | |
6077 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4; | |
6078 } else if(sps->poc_type == 1){//FIXME #define | |
6079 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb); | |
6080 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb); | |
6081 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb); | |
6082 sps->poc_cycle_length= get_ue_golomb(&s->gb); | |
6083 | |
6084 for(i=0; i<sps->poc_cycle_length; i++) | |
6085 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb); | |
6086 } | |
6087 if(sps->poc_type > 2){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
6088 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type); |
1168 | 6089 return -1; |
6090 } | |
6091 | |
6092 sps->ref_frame_count= get_ue_golomb(&s->gb); | |
2254
0dfe4e32b19c
H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2227
diff
changeset
|
6093 if(sps->ref_frame_count > MAX_PICTURE_COUNT-2){ |
0dfe4e32b19c
H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2227
diff
changeset
|
6094 av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n"); |
0dfe4e32b19c
H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2227
diff
changeset
|
6095 } |
1371 | 6096 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb); |
1168 | 6097 sps->mb_width= get_ue_golomb(&s->gb) + 1; |
6098 sps->mb_height= get_ue_golomb(&s->gb) + 1; | |
2422 | 6099 if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 || |
6100 avcodec_check_dimensions(NULL, 16*sps->mb_width, 16*sps->mb_height)) | |
6101 return -1; | |
6102 | |
1168 | 6103 sps->frame_mbs_only_flag= get_bits1(&s->gb); |
6104 if(!sps->frame_mbs_only_flag) | |
6105 sps->mb_aff= get_bits1(&s->gb); | |
6106 else | |
6107 sps->mb_aff= 0; | |
6108 | |
6109 sps->direct_8x8_inference_flag= get_bits1(&s->gb); | |
6110 | |
1371 | 6111 sps->crop= get_bits1(&s->gb); |
6112 if(sps->crop){ | |
6113 sps->crop_left = get_ue_golomb(&s->gb); | |
6114 sps->crop_right = get_ue_golomb(&s->gb); | |
6115 sps->crop_top = get_ue_golomb(&s->gb); | |
6116 sps->crop_bottom= get_ue_golomb(&s->gb); | |
6117 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
|
6118 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completly supported, this could look slightly wrong ...\n"); |
1371 | 6119 } |
6120 }else{ | |
6121 sps->crop_left = | |
6122 sps->crop_right = | |
6123 sps->crop_top = | |
6124 sps->crop_bottom= 0; | |
6125 } | |
6126 | |
1168 | 6127 sps->vui_parameters_present_flag= get_bits1(&s->gb); |
6128 if( sps->vui_parameters_present_flag ) | |
6129 decode_vui_parameters(h, sps); | |
6130 | |
6131 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
|
6132 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 | 6133 sps_id, sps->profile_idc, sps->level_idc, |
6134 sps->poc_type, | |
6135 sps->ref_frame_count, | |
6136 sps->mb_width, sps->mb_height, | |
6137 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"), | |
6138 sps->direct_8x8_inference_flag ? "8B8" : "", | |
1371 | 6139 sps->crop_left, sps->crop_right, |
6140 sps->crop_top, sps->crop_bottom, | |
1168 | 6141 sps->vui_parameters_present_flag ? "VUI" : "" |
6142 ); | |
6143 } | |
6144 return 0; | |
6145 } | |
6146 | |
6147 static inline int decode_picture_parameter_set(H264Context *h){ | |
6148 MpegEncContext * const s = &h->s; | |
6149 int pps_id= get_ue_golomb(&s->gb); | |
6150 PPS *pps= &h->pps_buffer[pps_id]; | |
6151 | |
6152 pps->sps_id= get_ue_golomb(&s->gb); | |
6153 pps->cabac= get_bits1(&s->gb); | |
6154 pps->pic_order_present= get_bits1(&s->gb); | |
6155 pps->slice_group_count= get_ue_golomb(&s->gb) + 1; | |
6156 if(pps->slice_group_count > 1 ){ | |
6157 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
|
6158 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n"); |
1168 | 6159 switch(pps->mb_slice_group_map_type){ |
6160 case 0: | |
6161 #if 0 | |
6162 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | | | |
6163 | run_length[ i ] |1 |ue(v) | | |
6164 #endif | |
6165 break; | |
6166 case 2: | |
6167 #if 0 | |
6168 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | | | |
6169 |{ | | | | |
6170 | top_left_mb[ i ] |1 |ue(v) | | |
6171 | bottom_right_mb[ i ] |1 |ue(v) | | |
6172 | } | | | | |
6173 #endif | |
6174 break; | |
6175 case 3: | |
6176 case 4: | |
6177 case 5: | |
6178 #if 0 | |
6179 | slice_group_change_direction_flag |1 |u(1) | | |
6180 | slice_group_change_rate_minus1 |1 |ue(v) | | |
6181 #endif | |
6182 break; | |
6183 case 6: | |
6184 #if 0 | |
6185 | slice_group_id_cnt_minus1 |1 |ue(v) | | |
6186 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | | | |
6187 |) | | | | |
6188 | slice_group_id[ i ] |1 |u(v) | | |
6189 #endif | |
1214 | 6190 break; |
1168 | 6191 } |
6192 } | |
6193 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
6194 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
6195 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
|
6196 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n"); |
1168 | 6197 return -1; |
6198 } | |
6199 | |
6200 pps->weighted_pred= get_bits1(&s->gb); | |
6201 pps->weighted_bipred_idc= get_bits(&s->gb, 2); | |
6202 pps->init_qp= get_se_golomb(&s->gb) + 26; | |
6203 pps->init_qs= get_se_golomb(&s->gb) + 26; | |
6204 pps->chroma_qp_index_offset= get_se_golomb(&s->gb); | |
6205 pps->deblocking_filter_parameters_present= get_bits1(&s->gb); | |
6206 pps->constrained_intra_pred= get_bits1(&s->gb); | |
6207 pps->redundant_pic_cnt_present = get_bits1(&s->gb); | |
6208 | |
6209 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
|
6210 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 | 6211 pps_id, pps->sps_id, |
6212 pps->cabac ? "CABAC" : "CAVLC", | |
6213 pps->slice_group_count, | |
6214 pps->ref_count[0], pps->ref_count[1], | |
6215 pps->weighted_pred ? "weighted" : "", | |
6216 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset, | |
6217 pps->deblocking_filter_parameters_present ? "LPAR" : "", | |
6218 pps->constrained_intra_pred ? "CONSTR" : "", | |
1371 | 6219 pps->redundant_pic_cnt_present ? "REDU" : "" |
1168 | 6220 ); |
6221 } | |
6222 | |
6223 return 0; | |
6224 } | |
6225 | |
6226 /** | |
6227 * finds the end of the current frame in the bitstream. | |
6228 * @return the position of the first byte of the next frame, or -1 | |
6229 */ | |
2392 | 6230 static int find_frame_end(H264Context *h, const uint8_t *buf, int buf_size){ |
1187 | 6231 int i; |
1168 | 6232 uint32_t state; |
2392 | 6233 ParseContext *pc = &(h->s.parse_context); |
1168 | 6234 //printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]); |
6235 // mb_addr= pc->mb_addr - 1; | |
6236 state= pc->state; | |
2392 | 6237 for(i=0; i<=buf_size; i++){ |
1168 | 6238 if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){ |
2392 | 6239 tprintf("find_frame_end new startcode = %08x, frame_start_found = %d, pos = %d\n", state, pc->frame_start_found, i); |
1168 | 6240 if(pc->frame_start_found){ |
2392 | 6241 // If there isn't one more byte in the buffer |
6242 // the test on first_mb_in_slice cannot be done yet | |
6243 // do it at next call. | |
6244 if (i >= buf_size) break; | |
6245 if (buf[i] & 0x80) { | |
6246 // first_mb_in_slice is 0, probably the first nal of a new | |
6247 // slice | |
6248 tprintf("find_frame_end frame_end_found, state = %08x, pos = %d\n", state, i); | |
6249 pc->state=-1; | |
6250 pc->frame_start_found= 0; | |
6251 return i-4; | |
6252 } | |
1168 | 6253 } |
2392 | 6254 pc->frame_start_found = 1; |
1168 | 6255 } |
2392 | 6256 if (i<buf_size) |
6257 state= (state<<8) | buf[i]; | |
1168 | 6258 } |
6259 | |
6260 pc->state= state; | |
1219 | 6261 return END_NOT_FOUND; |
1168 | 6262 } |
6263 | |
1988 | 6264 static int h264_parse(AVCodecParserContext *s, |
6265 AVCodecContext *avctx, | |
6266 uint8_t **poutbuf, int *poutbuf_size, | |
6267 const uint8_t *buf, int buf_size) | |
6268 { | |
2392 | 6269 H264Context *h = s->priv_data; |
6270 ParseContext *pc = &h->s.parse_context; | |
1988 | 6271 int next; |
6272 | |
2392 | 6273 next= find_frame_end(h, buf, buf_size); |
1988 | 6274 |
6275 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { | |
6276 *poutbuf = NULL; | |
6277 *poutbuf_size = 0; | |
6278 return buf_size; | |
6279 } | |
6280 | |
6281 *poutbuf = (uint8_t *)buf; | |
6282 *poutbuf_size = buf_size; | |
6283 return next; | |
6284 } | |
6285 | |
1168 | 6286 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ |
6287 MpegEncContext * const s = &h->s; | |
6288 AVCodecContext * const avctx= s->avctx; | |
6289 int buf_index=0; | |
1322 | 6290 #if 0 |
1168 | 6291 int i; |
6292 for(i=0; i<32; i++){ | |
6293 printf("%X ", buf[i]); | |
6294 } | |
6295 #endif | |
2392 | 6296 h->slice_num = 0; |
1168 | 6297 for(;;){ |
6298 int consumed; | |
6299 int dst_length; | |
6300 int bit_length; | |
6301 uint8_t *ptr; | |
2227 | 6302 int i, nalsize = 0; |
1168 | 6303 |
2227 | 6304 if(h->is_avc) { |
6305 if(buf_index >= buf_size) break; | |
6306 nalsize = 0; | |
6307 for(i = 0; i < h->nal_length_size; i++) | |
6308 nalsize = (nalsize << 8) | buf[buf_index++]; | |
6309 } else { | |
1168 | 6310 // start code prefix search |
6311 for(; buf_index + 3 < buf_size; buf_index++){ | |
6312 // this should allways succeed in the first iteration | |
6313 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | |
6314 break; | |
6315 } | |
6316 | |
6317 if(buf_index+3 >= buf_size) break; | |
6318 | |
6319 buf_index+=3; | |
2227 | 6320 } |
1168 | 6321 |
2401
46898a9fd6dc
Fix avc1 if there is nore than one nal per mov frame
rtognimp
parents:
2396
diff
changeset
|
6322 ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index); |
1168 | 6323 if(ptr[dst_length - 1] == 0) dst_length--; |
6324 bit_length= 8*dst_length - decode_rbsp_trailing(ptr + dst_length - 1); | |
6325 | |
6326 if(s->avctx->debug&FF_DEBUG_STARTCODE){ | |
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
6327 av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", h->nal_unit_type, buf_index, buf_size, dst_length); |
1168 | 6328 } |
6329 | |
2227 | 6330 if (h->is_avc && (nalsize != consumed)) |
6331 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); | |
6332 | |
1168 | 6333 buf_index += consumed; |
6334 | |
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
|
6335 if( s->hurry_up == 1 && h->nal_ref_idc == 0 ) |
1168 | 6336 continue; |
6337 | |
6338 switch(h->nal_unit_type){ | |
6339 case NAL_IDR_SLICE: | |
6340 idr(h); //FIXME ensure we dont loose some frames if there is reordering | |
6341 case NAL_SLICE: | |
6342 init_get_bits(&s->gb, ptr, bit_length); | |
6343 h->intra_gb_ptr= | |
6344 h->inter_gb_ptr= &s->gb; | |
6345 s->data_partitioning = 0; | |
6346 | |
6347 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
|
6348 if(h->redundant_pic_count==0 && s->hurry_up < 5 ) |
1168 | 6349 decode_slice(h); |
6350 break; | |
6351 case NAL_DPA: | |
6352 init_get_bits(&s->gb, ptr, bit_length); | |
6353 h->intra_gb_ptr= | |
6354 h->inter_gb_ptr= NULL; | |
6355 s->data_partitioning = 1; | |
6356 | |
6357 if(decode_slice_header(h) < 0) return -1; | |
6358 break; | |
6359 case NAL_DPB: | |
6360 init_get_bits(&h->intra_gb, ptr, bit_length); | |
6361 h->intra_gb_ptr= &h->intra_gb; | |
6362 break; | |
6363 case NAL_DPC: | |
6364 init_get_bits(&h->inter_gb, ptr, bit_length); | |
6365 h->inter_gb_ptr= &h->inter_gb; | |
1174 | 6366 |
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
|
6367 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning && s->hurry_up < 5 ) |
1168 | 6368 decode_slice(h); |
6369 break; | |
6370 case NAL_SEI: | |
6371 break; | |
6372 case NAL_SPS: | |
6373 init_get_bits(&s->gb, ptr, bit_length); | |
6374 decode_seq_parameter_set(h); | |
6375 | |
6376 if(s->flags& CODEC_FLAG_LOW_DELAY) | |
6377 s->low_delay=1; | |
6378 | |
2538 | 6379 if(avctx->has_b_frames < 2) |
6380 avctx->has_b_frames= !s->low_delay; | |
1168 | 6381 break; |
6382 case NAL_PPS: | |
6383 init_get_bits(&s->gb, ptr, bit_length); | |
6384 | |
6385 decode_picture_parameter_set(h); | |
6386 | |
6387 break; | |
6388 case NAL_PICTURE_DELIMITER: | |
6389 break; | |
6390 case NAL_FILTER_DATA: | |
6391 break; | |
2099 | 6392 default: |
6393 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type); | |
1168 | 6394 } |
6395 | |
6396 //FIXME move after where irt is set | |
6397 s->current_picture.pict_type= s->pict_type; | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6398 s->current_picture.key_frame= s->pict_type == I_TYPE && h->nal_unit_type == NAL_IDR_SLICE; |
1168 | 6399 } |
6400 | |
1174 | 6401 if(!s->current_picture_ptr) return buf_index; //no frame |
6402 | |
1168 | 6403 h->prev_frame_num_offset= h->frame_num_offset; |
6404 h->prev_frame_num= h->frame_num; | |
6405 if(s->current_picture_ptr->reference){ | |
6406 h->prev_poc_msb= h->poc_msb; | |
6407 h->prev_poc_lsb= h->poc_lsb; | |
6408 } | |
6409 if(s->current_picture_ptr->reference) | |
6410 execute_ref_pic_marking(h, h->mmco, h->mmco_index); | |
6411 | |
6412 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
|
6413 |
1168 | 6414 MPV_frame_end(s); |
6415 | |
6416 return buf_index; | |
6417 } | |
6418 | |
6419 /** | |
6420 * retunrs the number of bytes consumed for building the current frame | |
6421 */ | |
6422 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){ | |
6423 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
6424 pos -= s->parse_context.last_index; | |
6425 if(pos<0) pos=0; // FIXME remove (uneeded?) | |
6426 | |
6427 return pos; | |
6428 }else{ | |
6429 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...) | |
6430 if(pos+10>buf_size) pos=buf_size; // oops ;) | |
6431 | |
6432 return pos; | |
6433 } | |
6434 } | |
6435 | |
6436 static int decode_frame(AVCodecContext *avctx, | |
6437 void *data, int *data_size, | |
6438 uint8_t *buf, int buf_size) | |
6439 { | |
6440 H264Context *h = avctx->priv_data; | |
6441 MpegEncContext *s = &h->s; | |
6442 AVFrame *pict = data; | |
6443 int buf_index; | |
6444 | |
6445 s->flags= avctx->flags; | |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1706
diff
changeset
|
6446 s->flags2= avctx->flags2; |
1168 | 6447 |
6448 /* no supplementary picture */ | |
6449 if (buf_size == 0) { | |
6450 return 0; | |
6451 } | |
6452 | |
6453 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
2392 | 6454 int next= find_frame_end(h, buf, buf_size); |
1168 | 6455 |
1988 | 6456 if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 ) |
1168 | 6457 return buf_size; |
6458 //printf("next:%d buf_size:%d last_index:%d\n", next, buf_size, s->parse_context.last_index); | |
6459 } | |
6460 | |
2227 | 6461 if(h->is_avc && !h->got_avcC) { |
6462 int i, cnt, nalsize; | |
6463 unsigned char *p = avctx->extradata; | |
6464 if(avctx->extradata_size < 7) { | |
6465 av_log(avctx, AV_LOG_ERROR, "avcC too short\n"); | |
6466 return -1; | |
6467 } | |
6468 if(*p != 1) { | |
6469 av_log(avctx, AV_LOG_ERROR, "Unknown avcC version %d\n", *p); | |
6470 return -1; | |
6471 } | |
6472 /* sps and pps in the avcC always have length coded with 2 bytes, | |
6473 so put a fake nal_length_size = 2 while parsing them */ | |
6474 h->nal_length_size = 2; | |
6475 // Decode sps from avcC | |
6476 cnt = *(p+5) & 0x1f; // Number of sps | |
6477 p += 6; | |
6478 for (i = 0; i < cnt; i++) { | |
6479 nalsize = BE_16(p) + 2; | |
6480 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
6481 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); | |
6482 return -1; | |
6483 } | |
6484 p += nalsize; | |
6485 } | |
6486 // Decode pps from avcC | |
6487 cnt = *(p++); // Number of pps | |
6488 for (i = 0; i < cnt; i++) { | |
6489 nalsize = BE_16(p) + 2; | |
6490 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
6491 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); | |
6492 return -1; | |
6493 } | |
6494 p += nalsize; | |
6495 } | |
6496 // Now store right nal length size, that will be use to parse all other nals | |
6497 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1; | |
6498 // Do not reparse avcC | |
6499 h->got_avcC = 1; | |
6500 } | |
6501 | |
6502 if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){ | |
1168 | 6503 if(0 < decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) ) |
6504 return -1; | |
6505 } | |
6506 | |
6507 buf_index=decode_nal_units(h, buf, buf_size); | |
6508 if(buf_index < 0) | |
6509 return -1; | |
6510 | |
6511 //FIXME do something with unavailable reference frames | |
6512 | |
6513 // if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_index, buf_size); | |
1174 | 6514 if(!s->current_picture_ptr){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
6515 av_log(h->s.avctx, AV_LOG_DEBUG, "error, NO frame\n"); |
1174 | 6516 return -1; |
6517 } | |
6518 | |
2409 | 6519 { |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
6520 //#define DECODE_ORDER |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
6521 Picture *out = s->current_picture_ptr; |
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
6522 #ifndef DECODE_ORDER |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6523 /* Sort B-frames into display order */ |
2409 | 6524 Picture *cur = s->current_picture_ptr; |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6525 int out_idx = 0; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6526 int pics = 0; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6527 int i; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6528 out = NULL; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6529 |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6530 while(h->delayed_pic[pics]) pics++; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6531 h->delayed_pic[pics++] = cur; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6532 out = h->delayed_pic[0]; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6533 for(i=0; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6534 if(!out || h->delayed_pic[i]->poc < out->poc){ |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6535 out = h->delayed_pic[i]; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6536 out_idx = i; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6537 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6538 if(cur->reference == 0) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6539 cur->reference = 1; |
2538 | 6540 for(i=0; h->delayed_pic[i]; i++) |
6541 if(h->delayed_pic[i]->key_frame) | |
6542 h->delayed_output_poc = -1; | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6543 if(pics > FFMAX(1, s->avctx->has_b_frames)){ |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6544 if(out->reference == 1) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6545 out->reference = 0; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6546 for(i=out_idx; h->delayed_pic[i]; i++) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6547 h->delayed_pic[i] = h->delayed_pic[i+1]; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6548 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6549 |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6550 if((h->delayed_output_poc >=0 && h->delayed_output_poc > cur->poc) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6551 || (s->low_delay && (cur->pict_type == B_TYPE |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6552 || (!h->sps.gaps_in_frame_num_allowed_flag |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6553 && cur->poc - out->poc > 2)))){ |
2409 | 6554 s->low_delay = 0; |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6555 s->avctx->has_b_frames++; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6556 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6557 |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6558 h->delayed_output_poc = out->poc; |
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
6559 #endif |
2409 | 6560 |
6561 *pict= *(AVFrame*)out; | |
6562 } | |
6563 | |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1698
diff
changeset
|
6564 ff_print_debug_info(s, pict); |
1168 | 6565 assert(pict->data[0]); |
6566 //printf("out %d\n", (int)pict->data[0]); | |
6567 #if 0 //? | |
6568 | |
6569 /* Return the Picture timestamp as the frame number */ | |
6570 /* we substract 1 because it is added on utils.c */ | |
6571 avctx->frame_number = s->picture_number - 1; | |
6572 #endif | |
6573 #if 0 | |
6574 /* dont output the last pic after seeking */ | |
6575 if(s->last_picture_ptr || s->low_delay) | |
2392 | 6576 //Note this isnt a issue as a IDR pic should flush the buffers |
1168 | 6577 #endif |
6578 *data_size = sizeof(AVFrame); | |
6579 return get_consumed_bytes(s, buf_index, buf_size); | |
6580 } | |
6581 #if 0 | |
6582 static inline void fill_mb_avail(H264Context *h){ | |
6583 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
|
6584 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 6585 |
6586 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
|
6587 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
|
6588 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
|
6589 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num; |
1168 | 6590 }else{ |
6591 h->mb_avail[0]= | |
6592 h->mb_avail[1]= | |
6593 h->mb_avail[2]= 0; | |
6594 } | |
6595 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num; | |
6596 h->mb_avail[4]= 1; //FIXME move out | |
6597 h->mb_avail[5]= 0; //FIXME move out | |
6598 } | |
6599 #endif | |
6600 | |
6601 #if 0 //selftest | |
6602 #define COUNT 8000 | |
6603 #define SIZE (COUNT*40) | |
6604 int main(){ | |
6605 int i; | |
6606 uint8_t temp[SIZE]; | |
6607 PutBitContext pb; | |
6608 GetBitContext gb; | |
6609 // int int_temp[10000]; | |
6610 DSPContext dsp; | |
6611 AVCodecContext avctx; | |
6612 | |
6613 dsputil_init(&dsp, &avctx); | |
6614 | |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1453
diff
changeset
|
6615 init_put_bits(&pb, temp, SIZE); |
1168 | 6616 printf("testing unsigned exp golomb\n"); |
6617 for(i=0; i<COUNT; i++){ | |
6618 START_TIMER | |
6619 set_ue_golomb(&pb, i); | |
6620 STOP_TIMER("set_ue_golomb"); | |
6621 } | |
6622 flush_put_bits(&pb); | |
6623 | |
6624 init_get_bits(&gb, temp, 8*SIZE); | |
6625 for(i=0; i<COUNT; i++){ | |
6626 int j, s; | |
6627 | |
6628 s= show_bits(&gb, 24); | |
6629 | |
6630 START_TIMER | |
6631 j= get_ue_golomb(&gb); | |
6632 if(j != i){ | |
6633 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
6634 // return -1; | |
6635 } | |
6636 STOP_TIMER("get_ue_golomb"); | |
6637 } | |
6638 | |
6639 | |
1524 | 6640 init_put_bits(&pb, temp, SIZE); |
1168 | 6641 printf("testing signed exp golomb\n"); |
6642 for(i=0; i<COUNT; i++){ | |
6643 START_TIMER | |
6644 set_se_golomb(&pb, i - COUNT/2); | |
6645 STOP_TIMER("set_se_golomb"); | |
6646 } | |
6647 flush_put_bits(&pb); | |
6648 | |
6649 init_get_bits(&gb, temp, 8*SIZE); | |
6650 for(i=0; i<COUNT; i++){ | |
6651 int j, s; | |
6652 | |
6653 s= show_bits(&gb, 24); | |
6654 | |
6655 START_TIMER | |
6656 j= get_se_golomb(&gb); | |
6657 if(j != i - COUNT/2){ | |
6658 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
6659 // return -1; | |
6660 } | |
6661 STOP_TIMER("get_se_golomb"); | |
6662 } | |
6663 | |
6664 printf("testing 4x4 (I)DCT\n"); | |
6665 | |
6666 DCTELEM block[16]; | |
6667 uint8_t src[16], ref[16]; | |
6668 uint64_t error= 0, max_error=0; | |
6669 | |
6670 for(i=0; i<COUNT; i++){ | |
6671 int j; | |
6672 // printf("%d %d %d\n", r1, r2, (r2-r1)*16); | |
6673 for(j=0; j<16; j++){ | |
6674 ref[j]= random()%255; | |
6675 src[j]= random()%255; | |
6676 } | |
6677 | |
6678 h264_diff_dct_c(block, src, ref, 4); | |
6679 | |
6680 //normalize | |
6681 for(j=0; j<16; j++){ | |
6682 // printf("%d ", block[j]); | |
6683 block[j]= block[j]*4; | |
6684 if(j&1) block[j]= (block[j]*4 + 2)/5; | |
6685 if(j&4) block[j]= (block[j]*4 + 2)/5; | |
6686 } | |
6687 // printf("\n"); | |
6688 | |
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
6689 s->dsp.h264_idct_add(ref, block, 4); |
1168 | 6690 /* for(j=0; j<16; j++){ |
6691 printf("%d ", ref[j]); | |
6692 } | |
6693 printf("\n");*/ | |
6694 | |
6695 for(j=0; j<16; j++){ | |
6696 int diff= ABS(src[j] - ref[j]); | |
6697 | |
6698 error+= diff*diff; | |
6699 max_error= FFMAX(max_error, diff); | |
6700 } | |
6701 } | |
6702 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error ); | |
6703 #if 0 | |
6704 printf("testing quantizer\n"); | |
6705 for(qp=0; qp<52; qp++){ | |
6706 for(i=0; i<16; i++) | |
6707 src1_block[i]= src2_block[i]= random()%255; | |
6708 | |
6709 } | |
6710 #endif | |
6711 printf("Testing NAL layer\n"); | |
6712 | |
6713 uint8_t bitstream[COUNT]; | |
6714 uint8_t nal[COUNT*2]; | |
6715 H264Context h; | |
6716 memset(&h, 0, sizeof(H264Context)); | |
6717 | |
6718 for(i=0; i<COUNT; i++){ | |
6719 int zeros= i; | |
6720 int nal_length; | |
6721 int consumed; | |
6722 int out_length; | |
6723 uint8_t *out; | |
6724 int j; | |
6725 | |
6726 for(j=0; j<COUNT; j++){ | |
6727 bitstream[j]= (random() % 255) + 1; | |
6728 } | |
6729 | |
6730 for(j=0; j<zeros; j++){ | |
6731 int pos= random() % COUNT; | |
6732 while(bitstream[pos] == 0){ | |
6733 pos++; | |
6734 pos %= COUNT; | |
6735 } | |
6736 bitstream[pos]=0; | |
6737 } | |
6738 | |
6739 START_TIMER | |
6740 | |
6741 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2); | |
6742 if(nal_length<0){ | |
6743 printf("encoding failed\n"); | |
6744 return -1; | |
6745 } | |
6746 | |
6747 out= decode_nal(&h, nal, &out_length, &consumed, nal_length); | |
6748 | |
6749 STOP_TIMER("NAL") | |
6750 | |
6751 if(out_length != COUNT){ | |
6752 printf("incorrect length %d %d\n", out_length, COUNT); | |
6753 return -1; | |
6754 } | |
6755 | |
6756 if(consumed != nal_length){ | |
6757 printf("incorrect consumed length %d %d\n", nal_length, consumed); | |
6758 return -1; | |
6759 } | |
6760 | |
6761 if(memcmp(bitstream, out, COUNT)){ | |
6762 printf("missmatch\n"); | |
6763 return -1; | |
6764 } | |
6765 } | |
6766 | |
6767 printf("Testing RBSP\n"); | |
6768 | |
6769 | |
6770 return 0; | |
6771 } | |
6772 #endif | |
6773 | |
6774 | |
6775 static int decode_end(AVCodecContext *avctx) | |
6776 { | |
6777 H264Context *h = avctx->priv_data; | |
6778 MpegEncContext *s = &h->s; | |
6779 | |
6780 free_tables(h); //FIXME cleanup init stuff perhaps | |
6781 MPV_common_end(s); | |
6782 | |
6783 // memset(h, 0, sizeof(H264Context)); | |
6784 | |
6785 return 0; | |
6786 } | |
6787 | |
6788 | |
6789 AVCodec h264_decoder = { | |
6790 "h264", | |
6791 CODEC_TYPE_VIDEO, | |
6792 CODEC_ID_H264, | |
6793 sizeof(H264Context), | |
6794 decode_init, | |
6795 NULL, | |
6796 decode_end, | |
6797 decode_frame, | |
2453 | 6798 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
1168 | 6799 }; |
6800 | |
1988 | 6801 AVCodecParser h264_parser = { |
6802 { CODEC_ID_H264 }, | |
2392 | 6803 sizeof(H264Context), |
1988 | 6804 NULL, |
6805 h264_parse, | |
6806 ff_parse_close, | |
6807 }; | |
6808 | |
1234 | 6809 #include "svq3.c" |