Mercurial > libavcodec.hg
annotate h264.c @ 3556:6805c1e5507e libavcodec
Fix some "'static' is not at beginning of declaration" warnings.
author | diego |
---|---|
date | Tue, 08 Aug 2006 10:24:26 +0000 |
parents | 5ef29058581e |
children | 47821be55b6c |
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 | |
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
3029
diff
changeset
|
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
1168 | 18 * |
19 */ | |
2967 | 20 |
1168 | 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 |
3284
a224d9752912
don't force asserts in release builds. 2% faster h264.
lorenm
parents:
3219
diff
changeset
|
36 //#undef NDEBUG |
1168 | 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 | |
3316 | 57 /* Compiling in interlaced support reduces the speed |
58 * of progressive decoding by about 2%. */ | |
59 #define ALLOW_INTERLACE | |
60 | |
61 #ifdef ALLOW_INTERLACE | |
62 #define MB_MBAFF h->mb_mbaff | |
63 #define MB_FIELD h->mb_field_decoding_flag | |
64 #define FRAME_MBAFF h->mb_aff_frame | |
65 #else | |
66 #define MB_MBAFF 0 | |
67 #define MB_FIELD 0 | |
68 #define FRAME_MBAFF 0 | |
69 #undef IS_INTERLACED | |
70 #define IS_INTERLACED(mb_type) 0 | |
71 #endif | |
72 | |
1168 | 73 /** |
74 * Sequence parameter set | |
75 */ | |
76 typedef struct SPS{ | |
2967 | 77 |
1168 | 78 int profile_idc; |
79 int level_idc; | |
2763 | 80 int transform_bypass; ///< qpprime_y_zero_transform_bypass_flag |
1168 | 81 int log2_max_frame_num; ///< log2_max_frame_num_minus4 + 4 |
82 int poc_type; ///< pic_order_cnt_type | |
83 int log2_max_poc_lsb; ///< log2_max_pic_order_cnt_lsb_minus4 | |
84 int delta_pic_order_always_zero_flag; | |
85 int offset_for_non_ref_pic; | |
86 int offset_for_top_to_bottom_field; | |
87 int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle | |
88 int ref_frame_count; ///< num_ref_frames | |
1371 | 89 int gaps_in_frame_num_allowed_flag; |
1168 | 90 int mb_width; ///< frame_width_in_mbs_minus1 + 1 |
91 int mb_height; ///< frame_height_in_mbs_minus1 + 1 | |
92 int frame_mbs_only_flag; | |
93 int mb_aff; ///<mb_adaptive_frame_field_flag | |
94 int direct_8x8_inference_flag; | |
1371 | 95 int crop; ///< frame_cropping_flag |
96 int crop_left; ///< frame_cropping_rect_left_offset | |
97 int crop_right; ///< frame_cropping_rect_right_offset | |
98 int crop_top; ///< frame_cropping_rect_top_offset | |
99 int crop_bottom; ///< frame_cropping_rect_bottom_offset | |
1168 | 100 int vui_parameters_present_flag; |
1548 | 101 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
|
102 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
|
103 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
|
104 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
|
105 int fixed_frame_rate_flag; |
1168 | 106 short offset_for_ref_frame[256]; //FIXME dyn aloc? |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
107 int bitstream_restriction_flag; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
108 int num_reorder_frames; |
2919 | 109 int scaling_matrix_present; |
110 uint8_t scaling_matrix4[6][16]; | |
111 uint8_t scaling_matrix8[2][64]; | |
1168 | 112 }SPS; |
113 | |
114 /** | |
115 * Picture parameter set | |
116 */ | |
117 typedef struct PPS{ | |
118 int sps_id; | |
119 int cabac; ///< entropy_coding_mode_flag | |
120 int pic_order_present; ///< pic_order_present_flag | |
121 int slice_group_count; ///< num_slice_groups_minus1 + 1 | |
122 int mb_slice_group_map_type; | |
123 int ref_count[2]; ///< num_ref_idx_l0/1_active_minus1 + 1 | |
124 int weighted_pred; ///< weighted_pred_flag | |
125 int weighted_bipred_idc; | |
126 int init_qp; ///< pic_init_qp_minus26 + 26 | |
127 int init_qs; ///< pic_init_qs_minus26 + 26 | |
128 int chroma_qp_index_offset; | |
129 int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag | |
130 int constrained_intra_pred; ///< constrained_intra_pred_flag | |
131 int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag | |
2755 | 132 int transform_8x8_mode; ///< transform_8x8_mode_flag |
2919 | 133 uint8_t scaling_matrix4[6][16]; |
134 uint8_t scaling_matrix8[2][64]; | |
1168 | 135 }PPS; |
136 | |
137 /** | |
138 * Memory management control operation opcode. | |
139 */ | |
140 typedef enum MMCOOpcode{ | |
141 MMCO_END=0, | |
142 MMCO_SHORT2UNUSED, | |
143 MMCO_LONG2UNUSED, | |
144 MMCO_SHORT2LONG, | |
145 MMCO_SET_MAX_LONG, | |
2967 | 146 MMCO_RESET, |
1168 | 147 MMCO_LONG, |
148 } MMCOOpcode; | |
149 | |
150 /** | |
151 * Memory management control operation. | |
152 */ | |
153 typedef struct MMCO{ | |
154 MMCOOpcode opcode; | |
155 int short_frame_num; | |
156 int long_index; | |
157 } MMCO; | |
158 | |
159 /** | |
160 * H264Context | |
161 */ | |
162 typedef struct H264Context{ | |
163 MpegEncContext s; | |
2967 | 164 int nal_ref_idc; |
1168 | 165 int nal_unit_type; |
2979 | 166 #define NAL_SLICE 1 |
167 #define NAL_DPA 2 | |
168 #define NAL_DPB 3 | |
169 #define NAL_DPC 4 | |
170 #define NAL_IDR_SLICE 5 | |
171 #define NAL_SEI 6 | |
172 #define NAL_SPS 7 | |
173 #define NAL_PPS 8 | |
174 #define NAL_AUD 9 | |
2960 | 175 #define NAL_END_SEQUENCE 10 |
176 #define NAL_END_STREAM 11 | |
177 #define NAL_FILLER_DATA 12 | |
178 #define NAL_SPS_EXT 13 | |
179 #define NAL_AUXILIARY_SLICE 19 | |
1168 | 180 uint8_t *rbsp_buffer; |
3066
04b924f8f5a5
warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it
diego
parents:
3063
diff
changeset
|
181 unsigned int rbsp_buffer_size; |
1168 | 182 |
2227 | 183 /** |
184 * Used to parse AVC variant of h264 | |
185 */ | |
186 int is_avc; ///< this flag is != 0 if codec is avc1 | |
187 int got_avcC; ///< flag used to parse avcC data only once | |
188 int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) | |
189 | |
1168 | 190 int chroma_qp; //QPc |
191 | |
3316 | 192 int prev_mb_skipped; |
193 int next_mb_skipped; | |
1168 | 194 |
195 //prediction stuff | |
196 int chroma_pred_mode; | |
197 int intra16x16_pred_mode; | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
198 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
199 int top_mb_xy; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
200 int left_mb_xy[2]; |
2967 | 201 |
1168 | 202 int8_t intra4x4_pred_mode_cache[5*8]; |
203 int8_t (*intra4x4_pred_mode)[8]; | |
204 void (*pred4x4 [9+3])(uint8_t *src, uint8_t *topright, int stride);//FIXME move to dsp? | |
2755 | 205 void (*pred8x8l [9+3])(uint8_t *src, int topleft, int topright, int stride); |
1168 | 206 void (*pred8x8 [4+3])(uint8_t *src, int stride); |
207 void (*pred16x16[4+3])(uint8_t *src, int stride); | |
208 unsigned int topleft_samples_available; | |
209 unsigned int top_samples_available; | |
210 unsigned int topright_samples_available; | |
211 unsigned int left_samples_available; | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
212 uint8_t (*top_borders[2])[16+2*8]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
213 uint8_t left_border[2*(17+2*9)]; |
1168 | 214 |
215 /** | |
216 * non zero coeff count cache. | |
217 * is 64 if not available. | |
218 */ | |
3089 | 219 DECLARE_ALIGNED_8(uint8_t, non_zero_count_cache[6*8]); |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
220 uint8_t (*non_zero_count)[16]; |
1168 | 221 |
222 /** | |
223 * Motion vector cache. | |
224 */ | |
3089 | 225 DECLARE_ALIGNED_8(int16_t, mv_cache[2][5*8][2]); |
226 DECLARE_ALIGNED_8(int8_t, ref_cache[2][5*8]); | |
1168 | 227 #define LIST_NOT_USED -1 //FIXME rename? |
228 #define PART_NOT_AVAILABLE -2 | |
2967 | 229 |
1168 | 230 /** |
231 * is 1 if the specific list MV&references are set to 0,0,-2. | |
232 */ | |
233 int mv_cache_clean[2]; | |
234 | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
235 /** |
2755 | 236 * number of neighbors (top and/or left) that used 8x8 dct |
237 */ | |
238 int neighbor_transform_size; | |
239 | |
240 /** | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
241 * 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
|
242 * 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
|
243 */ |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
244 int block_offset[2*(16+8)]; |
2967 | 245 |
2641
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
246 uint32_t *mb2b_xy; //FIXME are these 4 a good idea? |
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
247 uint32_t *mb2b8_xy; |
2395 | 248 int b_stride; //FIXME use s->b4_stride |
1168 | 249 int b8_stride; |
250 | |
3316 | 251 int mb_linesize; ///< may be equal to s->linesize or s->linesize*2, for mbaff |
252 int mb_uvlinesize; | |
253 | |
254 int emu_edge_width; | |
255 int emu_edge_height; | |
256 | |
1234 | 257 int halfpel_flag; |
258 int thirdpel_flag; | |
259 | |
1319 | 260 int unknown_svq3_flag; |
261 int next_slice_index; | |
262 | |
1168 | 263 SPS sps_buffer[MAX_SPS_COUNT]; |
264 SPS sps; ///< current sps | |
2967 | 265 |
1168 | 266 PPS pps_buffer[MAX_PPS_COUNT]; |
267 /** | |
268 * current pps | |
269 */ | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
270 PPS pps; //FIXME move to Picture perhaps? (->no) do we need that? |
1168 | 271 |
2919 | 272 uint32_t dequant4_buffer[6][52][16]; |
273 uint32_t dequant8_buffer[2][52][64]; | |
274 uint32_t (*dequant4_coeff[6])[16]; | |
275 uint32_t (*dequant8_coeff[2])[64]; | |
276 int dequant_coeff_pps; ///< reinit tables when pps changes | |
2755 | 277 |
1168 | 278 int slice_num; |
279 uint8_t *slice_table_base; | |
3316 | 280 uint8_t *slice_table; ///< slice_table_base + 2*mb_stride + 1 |
1168 | 281 int slice_type; |
282 int slice_type_fixed; | |
2967 | 283 |
1168 | 284 //interlacing specific flags |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
285 int mb_aff_frame; |
1168 | 286 int mb_field_decoding_flag; |
3316 | 287 int mb_mbaff; ///< mb_aff_frame && mb_field_decoding_flag |
2967 | 288 |
1168 | 289 int sub_mb_type[4]; |
2967 | 290 |
1168 | 291 //POC stuff |
292 int poc_lsb; | |
293 int poc_msb; | |
294 int delta_poc_bottom; | |
295 int delta_poc[2]; | |
296 int frame_num; | |
297 int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0 | |
298 int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0 | |
299 int frame_num_offset; ///< for POC type 2 | |
300 int prev_frame_num_offset; ///< for POC type 2 | |
301 int prev_frame_num; ///< frame_num of the last pic for POC type 1/2 | |
302 | |
303 /** | |
304 * frame_num for frames or 2*frame_num for field pics. | |
305 */ | |
306 int curr_pic_num; | |
2967 | 307 |
1168 | 308 /** |
309 * max_frame_num or 2*max_frame_num for field pics. | |
310 */ | |
311 int max_pic_num; | |
312 | |
313 //Weighted pred stuff | |
2415 | 314 int use_weight; |
315 int use_weight_chroma; | |
1168 | 316 int luma_log2_weight_denom; |
317 int chroma_log2_weight_denom; | |
3316 | 318 int luma_weight[2][48]; |
319 int luma_offset[2][48]; | |
320 int chroma_weight[2][48][2]; | |
321 int chroma_offset[2][48][2]; | |
322 int implicit_weight[48][48]; | |
2967 | 323 |
1168 | 324 //deblock |
2967 | 325 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
|
326 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
|
327 int slice_beta_offset; |
2967 | 328 |
1168 | 329 int redundant_pic_count; |
2967 | 330 |
1168 | 331 int direct_spatial_mv_pred; |
2396 | 332 int dist_scale_factor[16]; |
3316 | 333 int dist_scale_factor_field[32]; |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
334 int map_col_to_list0[2][16]; |
3316 | 335 int map_col_to_list0_field[2][32]; |
1168 | 336 |
337 /** | |
338 * num_ref_idx_l0/1_active_minus1 + 1 | |
339 */ | |
3316 | 340 int ref_count[2]; ///< counts frames or fields, depending on current mb mode |
2582 | 341 Picture *short_ref[32]; |
342 Picture *long_ref[32]; | |
1168 | 343 Picture default_ref_list[2][32]; |
3316 | 344 Picture ref_list[2][48]; ///< 0..15: frame refs, 16..47: mbaff field refs |
2409 | 345 Picture *delayed_pic[16]; //FIXME size? |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
346 Picture *delayed_output_pic; |
2967 | 347 |
1168 | 348 /** |
349 * memory management control operations buffer. | |
350 */ | |
351 MMCO mmco[MAX_MMCO_COUNT]; | |
352 int mmco_index; | |
2967 | 353 |
1168 | 354 int long_ref_count; ///< number of actual long term references |
355 int short_ref_count; ///< number of actual short term references | |
2967 | 356 |
1168 | 357 //data partitioning |
358 GetBitContext intra_gb; | |
359 GetBitContext inter_gb; | |
360 GetBitContext *intra_gb_ptr; | |
361 GetBitContext *inter_gb_ptr; | |
2967 | 362 |
3089 | 363 DECLARE_ALIGNED_8(DCTELEM, mb[16*24]); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
364 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
365 /** |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
366 * Cabac |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
367 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
368 CABACContext cabac; |
2755 | 369 uint8_t cabac_state[460]; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
370 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
|
371 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
372 /* 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
|
373 uint16_t *cbp_table; |
2314 | 374 int top_cbp; |
375 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
|
376 /* 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
|
377 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
|
378 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
|
379 int16_t (*mvd_table[2])[2]; |
3089 | 380 DECLARE_ALIGNED_8(int16_t, mvd_cache[2][5*8][2]); |
2396 | 381 uint8_t *direct_table; |
382 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
|
383 |
2748
135aa7d0bd17
avoid one transpose (730->680 dezicycles on duron)
michael
parents:
2717
diff
changeset
|
384 uint8_t zigzag_scan[16]; |
3174 | 385 uint8_t zigzag_scan8x8[64]; |
386 uint8_t zigzag_scan8x8_cavlc[64]; | |
3316 | 387 uint8_t field_scan[16]; |
388 uint8_t field_scan8x8[64]; | |
389 uint8_t field_scan8x8_cavlc[64]; | |
2763 | 390 const uint8_t *zigzag_scan_q0; |
3174 | 391 const uint8_t *zigzag_scan8x8_q0; |
392 const uint8_t *zigzag_scan8x8_cavlc_q0; | |
3316 | 393 const uint8_t *field_scan_q0; |
394 const uint8_t *field_scan8x8_q0; | |
395 const uint8_t *field_scan8x8_cavlc_q0; | |
2967 | 396 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
397 int x264_build; |
1168 | 398 }H264Context; |
399 | |
400 static VLC coeff_token_vlc[4]; | |
401 static VLC chroma_dc_coeff_token_vlc; | |
402 | |
403 static VLC total_zeros_vlc[15]; | |
404 static VLC chroma_dc_total_zeros_vlc[3]; | |
405 | |
406 static VLC run_vlc[6]; | |
407 static VLC run7_vlc; | |
408 | |
1234 | 409 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); |
410 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc); | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
411 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize); |
1234 | 412 |
3028 | 413 static always_inline uint32_t pack16to32(int a, int b){ |
1269 | 414 #ifdef WORDS_BIGENDIAN |
415 return (b&0xFFFF) + (a<<16); | |
416 #else | |
417 return (a&0xFFFF) + (b<<16); | |
418 #endif | |
419 } | |
420 | |
1168 | 421 /** |
422 * fill a rectangle. | |
2392 | 423 * @param h height of the rectangle, should be a constant |
424 * @param w width of the rectangle, should be a constant | |
1168 | 425 * @param size the size of val (1 or 4), should be a constant |
426 */ | |
3028 | 427 static always_inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){ |
1187 | 428 uint8_t *p= (uint8_t*)vp; |
1168 | 429 assert(size==1 || size==4); |
3315 | 430 assert(w<=4); |
2967 | 431 |
1168 | 432 w *= size; |
433 stride *= size; | |
2967 | 434 |
2962 | 435 assert((((long)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0); |
2669 | 436 assert((stride&(w-1))==0); |
3315 | 437 if(w==2){ |
438 const uint16_t v= size==4 ? val : val*0x0101; | |
439 *(uint16_t*)(p + 0*stride)= v; | |
440 if(h==1) return; | |
441 *(uint16_t*)(p + 1*stride)= v; | |
442 if(h==2) return; | |
1168 | 443 *(uint16_t*)(p + 2*stride)= |
3315 | 444 *(uint16_t*)(p + 3*stride)= v; |
445 }else if(w==4){ | |
446 const uint32_t v= size==4 ? val : val*0x01010101; | |
447 *(uint32_t*)(p + 0*stride)= v; | |
448 if(h==1) return; | |
449 *(uint32_t*)(p + 1*stride)= v; | |
450 if(h==2) return; | |
1168 | 451 *(uint32_t*)(p + 2*stride)= |
3315 | 452 *(uint32_t*)(p + 3*stride)= v; |
453 }else if(w==8){ | |
454 //gcc can't optimize 64bit math on x86_32 | |
455 #if defined(ARCH_X86_64) || (defined(MP_WORDSIZE) && MP_WORDSIZE >= 64) | |
456 const uint64_t v= val*0x0100000001ULL; | |
457 *(uint64_t*)(p + 0*stride)= v; | |
458 if(h==1) return; | |
459 *(uint64_t*)(p + 1*stride)= v; | |
460 if(h==2) return; | |
1168 | 461 *(uint64_t*)(p + 2*stride)= |
3315 | 462 *(uint64_t*)(p + 3*stride)= v; |
463 }else if(w==16){ | |
464 const uint64_t v= val*0x0100000001ULL; | |
1168 | 465 *(uint64_t*)(p + 0+0*stride)= |
466 *(uint64_t*)(p + 8+0*stride)= | |
467 *(uint64_t*)(p + 0+1*stride)= | |
3315 | 468 *(uint64_t*)(p + 8+1*stride)= v; |
469 if(h==2) return; | |
1168 | 470 *(uint64_t*)(p + 0+2*stride)= |
471 *(uint64_t*)(p + 8+2*stride)= | |
472 *(uint64_t*)(p + 0+3*stride)= | |
3315 | 473 *(uint64_t*)(p + 8+3*stride)= v; |
474 #else | |
475 *(uint32_t*)(p + 0+0*stride)= | |
476 *(uint32_t*)(p + 4+0*stride)= val; | |
477 if(h==1) return; | |
478 *(uint32_t*)(p + 0+1*stride)= | |
479 *(uint32_t*)(p + 4+1*stride)= val; | |
480 if(h==2) return; | |
481 *(uint32_t*)(p + 0+2*stride)= | |
482 *(uint32_t*)(p + 4+2*stride)= | |
483 *(uint32_t*)(p + 0+3*stride)= | |
484 *(uint32_t*)(p + 4+3*stride)= val; | |
485 }else if(w==16){ | |
486 *(uint32_t*)(p + 0+0*stride)= | |
487 *(uint32_t*)(p + 4+0*stride)= | |
488 *(uint32_t*)(p + 8+0*stride)= | |
489 *(uint32_t*)(p +12+0*stride)= | |
490 *(uint32_t*)(p + 0+1*stride)= | |
491 *(uint32_t*)(p + 4+1*stride)= | |
492 *(uint32_t*)(p + 8+1*stride)= | |
493 *(uint32_t*)(p +12+1*stride)= val; | |
494 if(h==2) return; | |
495 *(uint32_t*)(p + 0+2*stride)= | |
496 *(uint32_t*)(p + 4+2*stride)= | |
497 *(uint32_t*)(p + 8+2*stride)= | |
498 *(uint32_t*)(p +12+2*stride)= | |
499 *(uint32_t*)(p + 0+3*stride)= | |
500 *(uint32_t*)(p + 4+3*stride)= | |
501 *(uint32_t*)(p + 8+3*stride)= | |
502 *(uint32_t*)(p +12+3*stride)= val; | |
503 #endif | |
1168 | 504 }else |
505 assert(0); | |
3315 | 506 assert(h==4); |
1168 | 507 } |
508 | |
3028 | 509 static void fill_caches(H264Context *h, int mb_type, int for_deblock){ |
1168 | 510 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
|
511 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 512 int topleft_xy, top_xy, topright_xy, left_xy[2]; |
513 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
|
514 int left_block[8]; |
1168 | 515 int i; |
516 | |
3482 | 517 //FIXME deblocking could skip the intra and nnz parts. |
518 if(for_deblock && (h->slice_num == 1 || h->slice_table[mb_xy] == h->slice_table[mb_xy-s->mb_stride]) && !FRAME_MBAFF) | |
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
519 return; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
520 |
2967 | 521 //wow what a mess, why didn't they simplify the interlacing&intra stuff, i can't imagine that these complex rules are worth it |
522 | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
523 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
|
524 topleft_xy = top_xy - 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
525 topright_xy= top_xy + 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
526 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
|
527 left_block[0]= 0; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
528 left_block[1]= 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
529 left_block[2]= 2; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
530 left_block[3]= 3; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
531 left_block[4]= 7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
532 left_block[5]= 10; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
533 left_block[6]= 8; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
534 left_block[7]= 11; |
3316 | 535 if(FRAME_MBAFF){ |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
536 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
|
537 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
|
538 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
|
539 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
|
540 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
|
541 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
|
542 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
|
543 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
|
544 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
|
545 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
|
546 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
|
547 if (bottom |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
548 ? !curr_mb_frame_flag // bottom macroblock |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
549 : (!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
|
550 ) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
551 top_xy -= s->mb_stride; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
552 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
553 if (bottom |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
554 ? !curr_mb_frame_flag // bottom macroblock |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
555 : (!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
|
556 ) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
557 topleft_xy -= s->mb_stride; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
558 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
559 if (bottom |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
560 ? !curr_mb_frame_flag // bottom macroblock |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
561 : (!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
|
562 ) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
563 topright_xy -= s->mb_stride; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
564 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
565 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
|
566 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
|
567 if (curr_mb_frame_flag) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
568 if (bottom) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
569 left_block[0]= 2; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
570 left_block[1]= 2; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
571 left_block[2]= 3; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
572 left_block[3]= 3; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
573 left_block[4]= 8; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
574 left_block[5]= 11; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
575 left_block[6]= 8; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
576 left_block[7]= 11; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
577 } else { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
578 left_block[0]= 0; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
579 left_block[1]= 0; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
580 left_block[2]= 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
581 left_block[3]= 1; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
582 left_block[4]= 7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
583 left_block[5]= 10; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
584 left_block[6]= 7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
585 left_block[7]= 10; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
586 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
587 } else { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
588 left_xy[1] += s->mb_stride; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
589 //left_block[0]= 0; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
590 left_block[1]= 2; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
591 left_block[2]= 0; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
592 left_block[3]= 2; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
593 //left_block[4]= 7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
594 left_block[5]= 10; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
595 left_block[6]= 7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
596 left_block[7]= 10; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
597 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
598 } |
1168 | 599 } |
600 | |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
601 h->top_mb_xy = top_xy; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
602 h->left_mb_xy[0] = left_xy[0]; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
603 h->left_mb_xy[1] = left_xy[1]; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
604 if(for_deblock){ |
3482 | 605 topleft_type = 0; |
606 topright_type = 0; | |
2449 | 607 top_type = h->slice_table[top_xy ] < 255 ? s->current_picture.mb_type[top_xy] : 0; |
608 left_type[0] = h->slice_table[left_xy[0] ] < 255 ? s->current_picture.mb_type[left_xy[0]] : 0; | |
609 left_type[1] = h->slice_table[left_xy[1] ] < 255 ? s->current_picture.mb_type[left_xy[1]] : 0; | |
3316 | 610 |
611 if(FRAME_MBAFF && !IS_INTRA(mb_type)){ | |
612 int list; | |
613 int v = *(uint16_t*)&h->non_zero_count[mb_xy][14]; | |
614 for(i=0; i<16; i++) | |
615 h->non_zero_count_cache[scan8[i]] = (v>>i)&1; | |
616 for(list=0; list<1+(h->slice_type==B_TYPE); list++){ | |
617 if(USES_LIST(mb_type,list)){ | |
618 uint32_t *src = (uint32_t*)s->current_picture.motion_val[list][h->mb2b_xy[mb_xy]]; | |
619 uint32_t *dst = (uint32_t*)h->mv_cache[list][scan8[0]]; | |
620 uint8_t *ref = &s->current_picture.ref_index[list][h->mb2b8_xy[mb_xy]]; | |
621 for(i=0; i<4; i++, dst+=8, src+=h->b_stride){ | |
622 dst[0] = src[0]; | |
623 dst[1] = src[1]; | |
624 dst[2] = src[2]; | |
625 dst[3] = src[3]; | |
626 } | |
627 *(uint32_t*)&h->ref_cache[list][scan8[ 0]] = | |
628 *(uint32_t*)&h->ref_cache[list][scan8[ 2]] = pack16to32(ref[0],ref[1])*0x0101; | |
629 ref += h->b8_stride; | |
630 *(uint32_t*)&h->ref_cache[list][scan8[ 8]] = | |
631 *(uint32_t*)&h->ref_cache[list][scan8[10]] = pack16to32(ref[0],ref[1])*0x0101; | |
632 }else{ | |
633 fill_rectangle(&h-> mv_cache[list][scan8[ 0]], 4, 4, 8, 0, 4); | |
634 fill_rectangle(&h->ref_cache[list][scan8[ 0]], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1); | |
635 } | |
636 } | |
637 } | |
2449 | 638 }else{ |
639 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0; | |
640 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0; | |
641 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0; | |
642 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0; | |
643 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0; | |
644 } | |
1168 | 645 |
646 if(IS_INTRA(mb_type)){ | |
2967 | 647 h->topleft_samples_available= |
648 h->top_samples_available= | |
1168 | 649 h->left_samples_available= 0xFFFF; |
650 h->topright_samples_available= 0xEEEA; | |
651 | |
652 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){ | |
653 h->topleft_samples_available= 0xB3FF; | |
654 h->top_samples_available= 0x33FF; | |
655 h->topright_samples_available= 0x26EA; | |
656 } | |
657 for(i=0; i<2; i++){ | |
658 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){ | |
659 h->topleft_samples_available&= 0xDF5F; | |
660 h->left_samples_available&= 0x5F5F; | |
661 } | |
662 } | |
2967 | 663 |
1168 | 664 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred)) |
665 h->topleft_samples_available&= 0x7FFF; | |
2967 | 666 |
1168 | 667 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred)) |
668 h->topright_samples_available&= 0xFBFF; | |
2967 | 669 |
1168 | 670 if(IS_INTRA4x4(mb_type)){ |
671 if(IS_INTRA4x4(top_type)){ | |
672 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4]; | |
673 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5]; | |
674 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6]; | |
675 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3]; | |
676 }else{ | |
677 int pred; | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
678 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
|
679 pred= -1; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
680 else{ |
1168 | 681 pred= 2; |
682 } | |
683 h->intra4x4_pred_mode_cache[4+8*0]= | |
684 h->intra4x4_pred_mode_cache[5+8*0]= | |
685 h->intra4x4_pred_mode_cache[6+8*0]= | |
686 h->intra4x4_pred_mode_cache[7+8*0]= pred; | |
687 } | |
688 for(i=0; i<2; i++){ | |
689 if(IS_INTRA4x4(left_type[i])){ | |
690 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[0+2*i]]; | |
691 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[1+2*i]]; | |
692 }else{ | |
693 int pred; | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
694 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
|
695 pred= -1; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
696 else{ |
1168 | 697 pred= 2; |
698 } | |
699 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= | |
700 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred; | |
701 } | |
702 } | |
703 } | |
704 } | |
2967 | 705 |
706 | |
1168 | 707 /* |
2967 | 708 0 . T T. T T T T |
709 1 L . .L . . . . | |
710 2 L . .L . . . . | |
711 3 . T TL . . . . | |
712 4 L . .L . . . . | |
713 5 L . .. . . . . | |
1168 | 714 */ |
715 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec) | |
716 if(top_type){ | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
717 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
|
718 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
|
719 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
|
720 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3]; |
2967 | 721 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
722 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
|
723 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8]; |
2967 | 724 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
725 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
|
726 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11]; |
2967 | 727 |
1168 | 728 }else{ |
2967 | 729 h->non_zero_count_cache[4+8*0]= |
1168 | 730 h->non_zero_count_cache[5+8*0]= |
731 h->non_zero_count_cache[6+8*0]= | |
732 h->non_zero_count_cache[7+8*0]= | |
2967 | 733 |
1168 | 734 h->non_zero_count_cache[1+8*0]= |
735 h->non_zero_count_cache[2+8*0]= | |
2967 | 736 |
1168 | 737 h->non_zero_count_cache[1+8*3]= |
2314 | 738 h->non_zero_count_cache[2+8*3]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
2967 | 739 |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
740 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
741 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
742 for (i=0; i<2; i++) { |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
743 if(left_type[i]){ |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
744 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
|
745 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
|
746 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
|
747 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
|
748 }else{ |
2967 | 749 h->non_zero_count_cache[3+8*1 + 2*8*i]= |
750 h->non_zero_count_cache[3+8*2 + 2*8*i]= | |
751 h->non_zero_count_cache[0+8*1 + 8*i]= | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
752 h->non_zero_count_cache[0+8*4 + 8*i]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
753 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
754 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
755 |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
756 if( h->pps.cabac ) { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
757 // top_cbp |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
758 if(top_type) { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
759 h->top_cbp = h->cbp_table[top_xy]; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
760 } else if(IS_INTRA(mb_type)) { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
761 h->top_cbp = 0x1C0; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
762 } else { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
763 h->top_cbp = 0; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
764 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
765 // left_cbp |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
766 if (left_type[0]) { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
767 h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
768 } else if(IS_INTRA(mb_type)) { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
769 h->left_cbp = 0x1C0; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
770 } else { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
771 h->left_cbp = 0; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
772 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
773 if (left_type[0]) { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
774 h->left_cbp |= ((h->cbp_table[left_xy[0]]>>((left_block[0]&(~1))+1))&0x1) << 1; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
775 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
776 if (left_type[1]) { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
777 h->left_cbp |= ((h->cbp_table[left_xy[1]]>>((left_block[2]&(~1))+1))&0x1) << 3; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
778 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
779 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
780 |
1168 | 781 #if 1 |
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
782 if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){ |
1168 | 783 int list; |
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
784 for(list=0; list<1+(h->slice_type==B_TYPE); list++){ |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
785 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !h->deblocking_filter){ |
1168 | 786 /*if(!h->mv_cache_clean[list]){ |
787 memset(h->mv_cache [list], 0, 8*5*2*sizeof(int16_t)); //FIXME clean only input? clean at all? | |
788 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t)); | |
789 h->mv_cache_clean[list]= 1; | |
790 }*/ | |
2396 | 791 continue; |
1168 | 792 } |
793 h->mv_cache_clean[list]= 0; | |
2967 | 794 |
3212 | 795 if(USES_LIST(top_type, list)){ |
1168 | 796 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; |
797 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride; | |
798 *(uint32_t*)h->mv_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 0]; | |
799 *(uint32_t*)h->mv_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 1]; | |
800 *(uint32_t*)h->mv_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 2]; | |
801 *(uint32_t*)h->mv_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 3]; | |
802 h->ref_cache[list][scan8[0] + 0 - 1*8]= | |
803 h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][b8_xy + 0]; | |
804 h->ref_cache[list][scan8[0] + 2 - 1*8]= | |
805 h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][b8_xy + 1]; | |
806 }else{ | |
2967 | 807 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]= |
808 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]= | |
809 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]= | |
1168 | 810 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0; |
811 *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101; | |
812 } | |
813 | |
814 //FIXME unify cleanup or sth | |
3212 | 815 if(USES_LIST(left_type[0], list)){ |
1168 | 816 const int b_xy= h->mb2b_xy[left_xy[0]] + 3; |
817 const int b8_xy= h->mb2b8_xy[left_xy[0]] + 1; | |
818 *(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]]; | |
819 *(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]]; | |
3316 | 820 h->ref_cache[list][scan8[0] - 1 + 0*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0]>>1)]; |
821 h->ref_cache[list][scan8[0] - 1 + 1*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[1]>>1)]; | |
1168 | 822 }else{ |
823 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 0*8]= | |
824 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 1*8]= 0; | |
825 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
826 h->ref_cache[list][scan8[0] - 1 + 1*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
827 } | |
2967 | 828 |
3212 | 829 if(USES_LIST(left_type[1], list)){ |
1168 | 830 const int b_xy= h->mb2b_xy[left_xy[1]] + 3; |
831 const int b8_xy= h->mb2b8_xy[left_xy[1]] + 1; | |
832 *(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]]; | |
833 *(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]]; | |
3316 | 834 h->ref_cache[list][scan8[0] - 1 + 2*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[2]>>1)]; |
835 h->ref_cache[list][scan8[0] - 1 + 3*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[3]>>1)]; | |
1168 | 836 }else{ |
837 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 2*8]= | |
838 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 3*8]= 0; | |
839 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
840 h->ref_cache[list][scan8[0] - 1 + 3*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
2669 | 841 assert((!left_type[0]) == (!left_type[1])); |
1168 | 842 } |
843 | |
3519 | 844 if((for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)) && !FRAME_MBAFF) |
2449 | 845 continue; |
846 | |
3212 | 847 if(USES_LIST(topleft_type, list)){ |
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
848 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
849 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
850 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
851 h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy]; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
852 }else{ |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
853 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= 0; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
854 h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
855 } |
2967 | 856 |
3212 | 857 if(USES_LIST(topright_type, list)){ |
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
858 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
859 const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
860 *(uint32_t*)h->mv_cache[list][scan8[0] + 4 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
861 h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][b8_xy]; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
862 }else{ |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
863 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
864 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; |
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
865 } |
2967 | 866 |
3519 | 867 if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF) |
3482 | 868 continue; |
2967 | 869 |
870 h->ref_cache[list][scan8[5 ]+1] = | |
871 h->ref_cache[list][scan8[7 ]+1] = | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
872 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewhere else) |
2967 | 873 h->ref_cache[list][scan8[4 ]] = |
1168 | 874 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; |
875 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]= | |
876 *(uint32_t*)h->mv_cache [list][scan8[7 ]+1]= | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
877 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else) |
1168 | 878 *(uint32_t*)h->mv_cache [list][scan8[4 ]]= |
879 *(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
|
880 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
881 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
|
882 /* XXX beurk, Load mvd */ |
3212 | 883 if(USES_LIST(top_type, list)){ |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
884 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
|
885 *(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
|
886 *(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
|
887 *(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
|
888 *(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
|
889 }else{ |
2967 | 890 *(uint32_t*)h->mvd_cache [list][scan8[0] + 0 - 1*8]= |
891 *(uint32_t*)h->mvd_cache [list][scan8[0] + 1 - 1*8]= | |
892 *(uint32_t*)h->mvd_cache [list][scan8[0] + 2 - 1*8]= | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
893 *(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
|
894 } |
3212 | 895 if(USES_LIST(left_type[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
|
896 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
|
897 *(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
|
898 *(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
|
899 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
900 *(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
|
901 *(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
|
902 } |
3212 | 903 if(USES_LIST(left_type[1], list)){ |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
904 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
|
905 *(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
|
906 *(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
|
907 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
908 *(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
|
909 *(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
|
910 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
911 *(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
|
912 *(uint32_t*)h->mvd_cache [list][scan8[7 ]+1]= |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
913 *(uint32_t*)h->mvd_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else) |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
914 *(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
|
915 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0; |
2396 | 916 |
917 if(h->slice_type == B_TYPE){ | |
918 fill_rectangle(&h->direct_cache[scan8[0]], 4, 4, 8, 0, 1); | |
919 | |
920 if(IS_DIRECT(top_type)){ | |
921 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101; | |
922 }else if(IS_8X8(top_type)){ | |
923 int b8_xy = h->mb2b8_xy[top_xy] + h->b8_stride; | |
924 h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy]; | |
925 h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 1]; | |
926 }else{ | |
927 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0; | |
928 } | |
2967 | 929 |
3316 | 930 if(IS_DIRECT(left_type[0])) |
931 h->direct_cache[scan8[0] - 1 + 0*8]= 1; | |
932 else if(IS_8X8(left_type[0])) | |
933 h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[h->mb2b8_xy[left_xy[0]] + 1 + h->b8_stride*(left_block[0]>>1)]; | |
934 else | |
935 h->direct_cache[scan8[0] - 1 + 0*8]= 0; | |
936 | |
937 if(IS_DIRECT(left_type[1])) | |
2396 | 938 h->direct_cache[scan8[0] - 1 + 2*8]= 1; |
3316 | 939 else if(IS_8X8(left_type[1])) |
940 h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[h->mb2b8_xy[left_xy[1]] + 1 + h->b8_stride*(left_block[2]>>1)]; | |
941 else | |
2396 | 942 h->direct_cache[scan8[0] - 1 + 2*8]= 0; |
3316 | 943 } |
944 } | |
945 | |
946 if(FRAME_MBAFF){ | |
947 #define MAP_MVS\ | |
948 MAP_F2F(scan8[0] - 1 - 1*8, topleft_type)\ | |
949 MAP_F2F(scan8[0] + 0 - 1*8, top_type)\ | |
950 MAP_F2F(scan8[0] + 1 - 1*8, top_type)\ | |
951 MAP_F2F(scan8[0] + 2 - 1*8, top_type)\ | |
952 MAP_F2F(scan8[0] + 3 - 1*8, top_type)\ | |
953 MAP_F2F(scan8[0] + 4 - 1*8, topright_type)\ | |
954 MAP_F2F(scan8[0] - 1 + 0*8, left_type[0])\ | |
955 MAP_F2F(scan8[0] - 1 + 1*8, left_type[0])\ | |
956 MAP_F2F(scan8[0] - 1 + 2*8, left_type[1])\ | |
957 MAP_F2F(scan8[0] - 1 + 3*8, left_type[1]) | |
958 if(MB_FIELD){ | |
959 #define MAP_F2F(idx, mb_type)\ | |
960 if(!IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\ | |
961 h->ref_cache[list][idx] <<= 1;\ | |
962 h->mv_cache[list][idx][1] /= 2;\ | |
963 h->mvd_cache[list][idx][1] /= 2;\ | |
2396 | 964 } |
3316 | 965 MAP_MVS |
966 #undef MAP_F2F | |
967 }else{ | |
968 #define MAP_F2F(idx, mb_type)\ | |
969 if(IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\ | |
970 h->ref_cache[list][idx] >>= 1;\ | |
971 h->mv_cache[list][idx][1] <<= 1;\ | |
972 h->mvd_cache[list][idx][1] <<= 1;\ | |
973 } | |
974 MAP_MVS | |
975 #undef MAP_F2F | |
2396 | 976 } |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
977 } |
1168 | 978 } |
979 } | |
980 #endif | |
2755 | 981 |
982 h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]); | |
1168 | 983 } |
984 | |
985 static inline void write_back_intra_pred_mode(H264Context *h){ | |
986 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
|
987 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 988 |
989 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1]; | |
990 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2]; | |
991 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3]; | |
992 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4]; | |
993 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4]; | |
994 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4]; | |
995 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4]; | |
996 } | |
997 | |
998 /** | |
999 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
1000 */ | |
1001 static inline int check_intra4x4_pred_mode(H264Context *h){ | |
1002 MpegEncContext * const s = &h->s; | |
1003 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0}; | |
1004 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED}; | |
1005 int i; | |
2967 | 1006 |
1168 | 1007 if(!(h->top_samples_available&0x8000)){ |
1008 for(i=0; i<4; i++){ | |
1009 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ]; | |
1010 if(status<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
1011 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 | 1012 return -1; |
1013 } else if(status){ | |
1014 h->intra4x4_pred_mode_cache[scan8[0] + i]= status; | |
1015 } | |
1016 } | |
1017 } | |
2967 | 1018 |
1168 | 1019 if(!(h->left_samples_available&0x8000)){ |
1020 for(i=0; i<4; i++){ | |
1021 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ]; | |
1022 if(status<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
1023 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 | 1024 return -1; |
1025 } else if(status){ | |
1026 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status; | |
1027 } | |
1028 } | |
1029 } | |
1030 | |
1031 return 0; | |
1032 } //FIXME cleanup like next | |
1033 | |
1034 /** | |
1035 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
1036 */ | |
1037 static inline int check_intra_pred_mode(H264Context *h, int mode){ | |
1038 MpegEncContext * const s = &h->s; | |
1039 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1}; | |
1040 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8}; | |
2967 | 1041 |
2392 | 1042 if(mode < 0 || mode > 6) { |
1043 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 | 1044 return -1; |
2392 | 1045 } |
2967 | 1046 |
1168 | 1047 if(!(h->top_samples_available&0x8000)){ |
1048 mode= top[ mode ]; | |
1049 if(mode<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
1050 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 | 1051 return -1; |
1052 } | |
1053 } | |
2967 | 1054 |
1168 | 1055 if(!(h->left_samples_available&0x8000)){ |
1056 mode= left[ mode ]; | |
1057 if(mode<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
1058 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 | 1059 return -1; |
2967 | 1060 } |
1168 | 1061 } |
1062 | |
1063 return mode; | |
1064 } | |
1065 | |
1066 /** | |
1067 * gets the predicted intra4x4 prediction mode. | |
1068 */ | |
1069 static inline int pred_intra_mode(H264Context *h, int n){ | |
1070 const int index8= scan8[n]; | |
1071 const int left= h->intra4x4_pred_mode_cache[index8 - 1]; | |
1072 const int top = h->intra4x4_pred_mode_cache[index8 - 8]; | |
1073 const int min= FFMIN(left, top); | |
1074 | |
1170 | 1075 tprintf("mode:%d %d min:%d\n", left ,top, min); |
1168 | 1076 |
1077 if(min<0) return DC_PRED; | |
1078 else return min; | |
1079 } | |
1080 | |
1081 static inline void write_back_non_zero_count(H264Context *h){ | |
1082 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
|
1083 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
|
1084 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
1085 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
|
1086 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
|
1087 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
|
1088 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
|
1089 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
|
1090 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
|
1091 h->non_zero_count[mb_xy][6]= h->non_zero_count_cache[6+8*4]; |
2967 | 1092 |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
1093 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
|
1094 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
|
1095 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
|
1096 |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
1097 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
|
1098 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
|
1099 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[2+8*4]; |
3316 | 1100 |
1101 if(FRAME_MBAFF){ | |
1102 // store all luma nnzs, for deblocking | |
1103 int v = 0, i; | |
1104 for(i=0; i<16; i++) | |
1105 v += (!!h->non_zero_count_cache[scan8[i]]) << i; | |
1106 *(uint16_t*)&h->non_zero_count[mb_xy][14] = v; | |
1107 } | |
1168 | 1108 } |
1109 | |
1110 /** | |
1111 * gets the predicted number of non zero coefficients. | |
1112 * @param n block index | |
1113 */ | |
1114 static inline int pred_non_zero_count(H264Context *h, int n){ | |
1115 const int index8= scan8[n]; | |
1116 const int left= h->non_zero_count_cache[index8 - 1]; | |
1117 const int top = h->non_zero_count_cache[index8 - 8]; | |
1118 int i= left + top; | |
2967 | 1119 |
1168 | 1120 if(i<64) i= (i+1)>>1; |
1121 | |
1170 | 1122 tprintf("pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31); |
1168 | 1123 |
1124 return i&31; | |
1125 } | |
1126 | |
1169 | 1127 static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width){ |
1128 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ]; | |
1129 | |
3316 | 1130 /* there is no consistent mapping of mvs to neighboring locations that will |
1131 * make mbaff happy, so we can't move all this logic to fill_caches */ | |
1132 if(FRAME_MBAFF){ | |
1133 MpegEncContext *s = &h->s; | |
1134 const int *mb_types = s->current_picture_ptr->mb_type; | |
1135 const int16_t *mv; | |
1136 *(uint32_t*)h->mv_cache[list][scan8[0]-2] = 0; | |
1137 *C = h->mv_cache[list][scan8[0]-2]; | |
1138 | |
1139 if(!MB_FIELD | |
1140 && (s->mb_y&1) && i < scan8[0]+8 && topright_ref != PART_NOT_AVAILABLE){ | |
1141 int topright_xy = s->mb_x + (s->mb_y-1)*s->mb_stride + (i == scan8[0]+3); | |
1142 if(IS_INTERLACED(mb_types[topright_xy])){ | |
1143 #define SET_DIAG_MV(MV_OP, REF_OP, X4, Y4)\ | |
1144 const int x4 = X4, y4 = Y4;\ | |
1145 const int mb_type = mb_types[(x4>>2)+(y4>>2)*s->mb_stride];\ | |
1146 if(!USES_LIST(mb_type,list) && !IS_8X8(mb_type))\ | |
1147 return LIST_NOT_USED;\ | |
1148 mv = s->current_picture_ptr->motion_val[list][x4 + y4*h->b_stride];\ | |
1149 h->mv_cache[list][scan8[0]-2][0] = mv[0];\ | |
1150 h->mv_cache[list][scan8[0]-2][1] = mv[1] MV_OP;\ | |
1151 return s->current_picture_ptr->ref_index[list][(x4>>1) + (y4>>1)*h->b8_stride] REF_OP; | |
1152 | |
1153 SET_DIAG_MV(*2, >>1, s->mb_x*4+(i&7)-4+part_width, s->mb_y*4-1); | |
1154 } | |
1155 } | |
1156 if(topright_ref == PART_NOT_AVAILABLE | |
1157 && ((s->mb_y&1) || i >= scan8[0]+8) && (i&7)==4 | |
1158 && h->ref_cache[list][scan8[0]-1] != PART_NOT_AVAILABLE){ | |
1159 if(!MB_FIELD | |
1160 && IS_INTERLACED(mb_types[h->left_mb_xy[0]])){ | |
1161 SET_DIAG_MV(*2, >>1, s->mb_x*4-1, (s->mb_y|1)*4+(s->mb_y&1)*2+(i>>4)-1); | |
1162 } | |
1163 if(MB_FIELD | |
1164 && !IS_INTERLACED(mb_types[h->left_mb_xy[0]]) | |
1165 && i >= scan8[0]+8){ | |
1166 // leftshift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's ok. | |
1167 SET_DIAG_MV(>>1, <<1, s->mb_x*4-1, (s->mb_y&~1)*4 - 1 + ((i-scan8[0])>>3)*2); | |
1168 } | |
1169 } | |
1170 #undef SET_DIAG_MV | |
1171 } | |
1172 | |
1169 | 1173 if(topright_ref != PART_NOT_AVAILABLE){ |
1174 *C= h->mv_cache[list][ i - 8 + part_width ]; | |
1175 return topright_ref; | |
1176 }else{ | |
1170 | 1177 tprintf("topright MV not available\n"); |
1178 | |
1169 | 1179 *C= h->mv_cache[list][ i - 8 - 1 ]; |
1180 return h->ref_cache[list][ i - 8 - 1 ]; | |
1181 } | |
1182 } | |
1183 | |
1168 | 1184 /** |
1185 * gets the predicted MV. | |
1186 * @param n the block index | |
1187 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4) | |
1188 * @param mx the x component of the predicted motion vector | |
1189 * @param my the y component of the predicted motion vector | |
1190 */ | |
1191 static inline void pred_motion(H264Context * const h, int n, int part_width, int list, int ref, int * const mx, int * const my){ | |
1192 const int index8= scan8[n]; | |
1193 const int top_ref= h->ref_cache[list][ index8 - 8 ]; | |
1194 const int left_ref= h->ref_cache[list][ index8 - 1 ]; | |
1195 const int16_t * const A= h->mv_cache[list][ index8 - 1 ]; | |
1196 const int16_t * const B= h->mv_cache[list][ index8 - 8 ]; | |
1169 | 1197 const int16_t * C; |
1198 int diagonal_ref, match_count; | |
1199 | |
1168 | 1200 assert(part_width==1 || part_width==2 || part_width==4); |
1169 | 1201 |
1168 | 1202 /* mv_cache |
2967 | 1203 B . . A T T T T |
1168 | 1204 U . . L . . , . |
1205 U . . L . . . . | |
1206 U . . L . . , . | |
1207 . . . L . . . . | |
1208 */ | |
1169 | 1209 |
1210 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width); | |
1211 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
|
1212 tprintf("pred_motion match_count=%d\n", match_count); |
1169 | 1213 if(match_count > 1){ //most common |
1214 *mx= mid_pred(A[0], B[0], C[0]); | |
1215 *my= mid_pred(A[1], B[1], C[1]); | |
1216 }else if(match_count==1){ | |
1217 if(left_ref==ref){ | |
1218 *mx= A[0]; | |
2967 | 1219 *my= A[1]; |
1169 | 1220 }else if(top_ref==ref){ |
1221 *mx= B[0]; | |
2967 | 1222 *my= B[1]; |
1169 | 1223 }else{ |
1224 *mx= C[0]; | |
2967 | 1225 *my= C[1]; |
1169 | 1226 } |
1227 }else{ | |
1228 if(top_ref == PART_NOT_AVAILABLE && diagonal_ref == PART_NOT_AVAILABLE && left_ref != PART_NOT_AVAILABLE){ | |
1229 *mx= A[0]; | |
2967 | 1230 *my= A[1]; |
1168 | 1231 }else{ |
1232 *mx= mid_pred(A[0], B[0], C[0]); | |
1233 *my= mid_pred(A[1], B[1], C[1]); | |
1234 } | |
1169 | 1235 } |
2967 | 1236 |
1187 | 1237 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 | 1238 } |
1239 | |
1240 /** | |
1241 * gets the directionally predicted 16x8 MV. | |
1242 * @param n the block index | |
1243 * @param mx the x component of the predicted motion vector | |
1244 * @param my the y component of the predicted motion vector | |
1245 */ | |
1246 static inline void pred_16x8_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
1247 if(n==0){ | |
1248 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ]; | |
1249 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ]; | |
1250 | |
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1251 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); |
2967 | 1252 |
1168 | 1253 if(top_ref == ref){ |
1254 *mx= B[0]; | |
1255 *my= B[1]; | |
1256 return; | |
1257 } | |
1258 }else{ | |
1259 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ]; | |
1260 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ]; | |
2967 | 1261 |
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1262 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 | 1263 |
1264 if(left_ref == ref){ | |
1265 *mx= A[0]; | |
1266 *my= A[1]; | |
1267 return; | |
1268 } | |
1269 } | |
1270 | |
1271 //RARE | |
1272 pred_motion(h, n, 4, list, ref, mx, my); | |
1273 } | |
1274 | |
1275 /** | |
1276 * gets the directionally predicted 8x16 MV. | |
1277 * @param n the block index | |
1278 * @param mx the x component of the predicted motion vector | |
1279 * @param my the y component of the predicted motion vector | |
1280 */ | |
1281 static inline void pred_8x16_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
1282 if(n==0){ | |
1283 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ]; | |
1284 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ]; | |
2967 | 1285 |
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1286 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 | 1287 |
1288 if(left_ref == ref){ | |
1289 *mx= A[0]; | |
1290 *my= A[1]; | |
1291 return; | |
1292 } | |
1293 }else{ | |
1169 | 1294 const int16_t * C; |
1295 int diagonal_ref; | |
1296 | |
1297 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2); | |
2967 | 1298 |
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1299 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 | 1300 |
2967 | 1301 if(diagonal_ref == ref){ |
1168 | 1302 *mx= C[0]; |
1303 *my= C[1]; | |
1304 return; | |
1305 } | |
1306 } | |
1307 | |
1308 //RARE | |
1309 pred_motion(h, n, 2, list, ref, mx, my); | |
1310 } | |
1311 | |
1312 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){ | |
1313 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ]; | |
1314 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ]; | |
1315 | |
2392 | 1316 tprintf("pred_pskip: (%d) (%d) at %2d %2d\n", top_ref, left_ref, h->s.mb_x, h->s.mb_y); |
1168 | 1317 |
1318 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE | |
1319 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0) | |
1320 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){ | |
2967 | 1321 |
1168 | 1322 *mx = *my = 0; |
1323 return; | |
1324 } | |
2967 | 1325 |
1168 | 1326 pred_motion(h, 0, 4, 0, 0, mx, my); |
1327 | |
1328 return; | |
1329 } | |
1330 | |
2396 | 1331 static inline void direct_dist_scale_factor(H264Context * const h){ |
1332 const int poc = h->s.current_picture_ptr->poc; | |
1333 const int poc1 = h->ref_list[1][0].poc; | |
1334 int i; | |
1335 for(i=0; i<h->ref_count[0]; i++){ | |
1336 int poc0 = h->ref_list[0][i].poc; | |
1337 int td = clip(poc1 - poc0, -128, 127); | |
1338 if(td == 0 /* FIXME || pic0 is a long-term ref */){ | |
1339 h->dist_scale_factor[i] = 256; | |
1340 }else{ | |
1341 int tb = clip(poc - poc0, -128, 127); | |
1342 int tx = (16384 + (ABS(td) >> 1)) / td; | |
1343 h->dist_scale_factor[i] = clip((tb*tx + 32) >> 6, -1024, 1023); | |
1344 } | |
1345 } | |
3316 | 1346 if(FRAME_MBAFF){ |
1347 for(i=0; i<h->ref_count[0]; i++){ | |
1348 h->dist_scale_factor_field[2*i] = | |
1349 h->dist_scale_factor_field[2*i+1] = h->dist_scale_factor[i]; | |
1350 } | |
1351 } | |
2396 | 1352 } |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1353 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
|
1354 MpegEncContext * const s = &h->s; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1355 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
|
1356 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
|
1357 int list, i, j; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1358 if(cur->pict_type == I_TYPE) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1359 cur->ref_count[0] = 0; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1360 if(cur->pict_type != B_TYPE) |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1361 cur->ref_count[1] = 0; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1362 for(list=0; list<2; list++){ |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1363 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
|
1364 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
|
1365 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
|
1366 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1367 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
|
1368 return; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1369 for(list=0; list<2; list++){ |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1370 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
|
1371 const int poc = ref1->ref_poc[list][i]; |
3125 | 1372 h->map_col_to_list0[list][i] = 0; /* bogus; fills in for missing frames */ |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1373 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
|
1374 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
|
1375 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
|
1376 break; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1377 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1378 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1379 } |
3316 | 1380 if(FRAME_MBAFF){ |
1381 for(list=0; list<2; list++){ | |
1382 for(i=0; i<ref1->ref_count[list]; i++){ | |
1383 j = h->map_col_to_list0[list][i]; | |
1384 h->map_col_to_list0_field[list][2*i] = 2*j; | |
1385 h->map_col_to_list0_field[list][2*i+1] = 2*j+1; | |
1386 } | |
1387 } | |
1388 } | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1389 } |
2396 | 1390 |
1391 static inline void pred_direct_motion(H264Context * const h, int *mb_type){ | |
1392 MpegEncContext * const s = &h->s; | |
1393 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; | |
1394 const int b8_xy = 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
1395 const int b4_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
1396 const int mb_type_col = h->ref_list[1][0].mb_type[mb_xy]; | |
1397 const int16_t (*l1mv0)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[0][b4_xy]; | |
2808
932ec96933f5
fixing colocated mv if colocated block is L1 predicted
michael
parents:
2803
diff
changeset
|
1398 const int16_t (*l1mv1)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[1][b4_xy]; |
2396 | 1399 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
|
1400 const int8_t *l1ref1 = &h->ref_list[1][0].ref_index[1][b8_xy]; |
2396 | 1401 const int is_b8x8 = IS_8X8(*mb_type); |
1402 int sub_mb_type; | |
1403 int i8, i4; | |
1404 | |
3316 | 1405 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM) |
2396 | 1406 if(IS_8X8(mb_type_col) && !h->sps.direct_8x8_inference_flag){ |
1407 /* FIXME save sub mb types from previous frames (or derive from MVs) | |
1408 * so we know exactly what block size to use */ | |
1409 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */ | |
2536 | 1410 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
3316 | 1411 }else if(!is_b8x8 && (mb_type_col & MB_TYPE_16x16_OR_INTRA)){ |
2396 | 1412 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ |
1413 *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */ | |
1414 }else{ | |
1415 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ | |
2536 | 1416 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
2396 | 1417 } |
1418 if(!is_b8x8) | |
1419 *mb_type |= MB_TYPE_DIRECT2; | |
3316 | 1420 if(MB_FIELD) |
1421 *mb_type |= MB_TYPE_INTERLACED; | |
2396 | 1422 |
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
|
1423 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); |
2967 | 1424 |
2396 | 1425 if(h->direct_spatial_mv_pred){ |
1426 int ref[2]; | |
1427 int mv[2][2]; | |
1428 int list; | |
1429 | |
3316 | 1430 /* FIXME interlacing + spatial direct uses wrong colocated block positions */ |
1431 | |
2396 | 1432 /* ref = min(neighbors) */ |
1433 for(list=0; list<2; list++){ | |
1434 int refa = h->ref_cache[list][scan8[0] - 1]; | |
1435 int refb = h->ref_cache[list][scan8[0] - 8]; | |
1436 int refc = h->ref_cache[list][scan8[0] - 8 + 4]; | |
1437 if(refc == -2) | |
1438 refc = h->ref_cache[list][scan8[0] - 8 - 1]; | |
1439 ref[list] = refa; | |
1440 if(ref[list] < 0 || (refb < ref[list] && refb >= 0)) | |
1441 ref[list] = refb; | |
1442 if(ref[list] < 0 || (refc < ref[list] && refc >= 0)) | |
1443 ref[list] = refc; | |
1444 if(ref[list] < 0) | |
1445 ref[list] = -1; | |
1446 } | |
1447 | |
1448 if(ref[0] < 0 && ref[1] < 0){ | |
1449 ref[0] = ref[1] = 0; | |
1450 mv[0][0] = mv[0][1] = | |
1451 mv[1][0] = mv[1][1] = 0; | |
1452 }else{ | |
1453 for(list=0; list<2; list++){ | |
1454 if(ref[list] >= 0) | |
1455 pred_motion(h, 0, 4, list, ref[list], &mv[list][0], &mv[list][1]); | |
1456 else | |
1457 mv[list][0] = mv[list][1] = 0; | |
1458 } | |
1459 } | |
1460 | |
1461 if(ref[1] < 0){ | |
1462 *mb_type &= ~MB_TYPE_P0L1; | |
1463 sub_mb_type &= ~MB_TYPE_P0L1; | |
1464 }else if(ref[0] < 0){ | |
1465 *mb_type &= ~MB_TYPE_P0L0; | |
1466 sub_mb_type &= ~MB_TYPE_P0L0; | |
1467 } | |
1468 | |
1469 if(IS_16X16(*mb_type)){ | |
3001
b52d8ee430f6
fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents:
2979
diff
changeset
|
1470 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, (uint8_t)ref[0], 1); |
b52d8ee430f6
fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents:
2979
diff
changeset
|
1471 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, (uint8_t)ref[1], 1); |
2967 | 1472 if(!IS_INTRA(mb_type_col) |
2834 | 1473 && ( (l1ref0[0] == 0 && ABS(l1mv0[0][0]) <= 1 && ABS(l1mv0[0][1]) <= 1) |
1474 || (l1ref0[0] < 0 && l1ref1[0] == 0 && ABS(l1mv1[0][0]) <= 1 && ABS(l1mv1[0][1]) <= 1 | |
1475 && (h->x264_build>33 || !h->x264_build)))){ | |
2396 | 1476 if(ref[0] > 0) |
1477 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
1478 else | |
1479 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
1480 if(ref[1] > 0) | |
1481 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
1482 else | |
1483 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
1484 }else{ | |
1485 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
1486 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
1487 } | |
1488 }else{ | |
1489 for(i8=0; i8<4; i8++){ | |
1490 const int x8 = i8&1; | |
1491 const int y8 = i8>>1; | |
2967 | 1492 |
2396 | 1493 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) |
1494 continue; | |
1495 h->sub_mb_type[i8] = sub_mb_type; | |
2967 | 1496 |
2396 | 1497 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mv[0][0],mv[0][1]), 4); |
1498 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
3001
b52d8ee430f6
fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents:
2979
diff
changeset
|
1499 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[0], 1); |
b52d8ee430f6
fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents:
2979
diff
changeset
|
1500 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[1], 1); |
2967 | 1501 |
2396 | 1502 /* col_zero_flag */ |
2967 | 1503 if(!IS_INTRA(mb_type_col) && ( l1ref0[x8 + y8*h->b8_stride] == 0 |
1504 || (l1ref0[x8 + y8*h->b8_stride] < 0 && l1ref1[x8 + y8*h->b8_stride] == 0 | |
2834 | 1505 && (h->x264_build>33 || !h->x264_build)))){ |
2808
932ec96933f5
fixing colocated mv if colocated block is L1 predicted
michael
parents:
2803
diff
changeset
|
1506 const int16_t (*l1mv)[2]= l1ref0[x8 + y8*h->b8_stride] == 0 ? l1mv0 : l1mv1; |
3002 | 1507 if(IS_SUB_8X8(sub_mb_type)){ |
1508 const int16_t *mv_col = l1mv[x8*3 + y8*3*h->b_stride]; | |
1509 if(ABS(mv_col[0]) <= 1 && ABS(mv_col[1]) <= 1){ | |
1510 if(ref[0] == 0) | |
1511 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1512 if(ref[1] == 0) | |
1513 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1514 } | |
1515 }else | |
2396 | 1516 for(i4=0; i4<4; i4++){ |
2808
932ec96933f5
fixing colocated mv if colocated block is L1 predicted
michael
parents:
2803
diff
changeset
|
1517 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; |
2396 | 1518 if(ABS(mv_col[0]) <= 1 && ABS(mv_col[1]) <= 1){ |
1519 if(ref[0] == 0) | |
1520 *(uint32_t*)h->mv_cache[0][scan8[i8*4+i4]] = 0; | |
1521 if(ref[1] == 0) | |
1522 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = 0; | |
1523 } | |
1524 } | |
1525 } | |
1526 } | |
1527 } | |
1528 }else{ /* direct temporal mv pred */ | |
3316 | 1529 const int *map_col_to_list0[2] = {h->map_col_to_list0[0], h->map_col_to_list0[1]}; |
1530 const int *dist_scale_factor = h->dist_scale_factor; | |
1531 | |
1532 if(FRAME_MBAFF){ | |
1533 if(IS_INTERLACED(*mb_type)){ | |
1534 map_col_to_list0[0] = h->map_col_to_list0_field[0]; | |
1535 map_col_to_list0[1] = h->map_col_to_list0_field[1]; | |
1536 dist_scale_factor = h->dist_scale_factor_field; | |
1537 } | |
1538 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col)){ | |
1539 /* FIXME assumes direct_8x8_inference == 1 */ | |
1540 const int pair_xy = s->mb_x + (s->mb_y&~1)*s->mb_stride; | |
1541 int mb_types_col[2]; | |
1542 int y_shift; | |
1543 | |
1544 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1 | |
1545 | (is_b8x8 ? 0 : MB_TYPE_DIRECT2) | |
1546 | (*mb_type & MB_TYPE_INTERLACED); | |
1547 sub_mb_type = MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_16x16; | |
1548 | |
1549 if(IS_INTERLACED(*mb_type)){ | |
1550 /* frame to field scaling */ | |
1551 mb_types_col[0] = h->ref_list[1][0].mb_type[pair_xy]; | |
1552 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride]; | |
1553 if(s->mb_y&1){ | |
1554 l1ref0 -= 2*h->b8_stride; | |
1555 l1ref1 -= 2*h->b8_stride; | |
1556 l1mv0 -= 4*h->b_stride; | |
1557 l1mv1 -= 4*h->b_stride; | |
1558 } | |
1559 y_shift = 0; | |
1560 | |
1561 if( (mb_types_col[0] & MB_TYPE_16x16_OR_INTRA) | |
1562 && (mb_types_col[1] & MB_TYPE_16x16_OR_INTRA) | |
1563 && !is_b8x8) | |
1564 *mb_type |= MB_TYPE_16x8; | |
1565 else | |
1566 *mb_type |= MB_TYPE_8x8; | |
1567 }else{ | |
1568 /* field to frame scaling */ | |
1569 /* col_mb_y = (mb_y&~1) + (topAbsDiffPOC < bottomAbsDiffPOC ? 0 : 1) | |
1570 * but in MBAFF, top and bottom POC are equal */ | |
1571 int dy = (s->mb_y&1) ? 1 : 2; | |
1572 mb_types_col[0] = | |
1573 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride]; | |
1574 l1ref0 += dy*h->b8_stride; | |
1575 l1ref1 += dy*h->b8_stride; | |
1576 l1mv0 += 2*dy*h->b_stride; | |
1577 l1mv1 += 2*dy*h->b_stride; | |
1578 y_shift = 2; | |
1579 | |
1580 if((mb_types_col[0] & (MB_TYPE_16x16_OR_INTRA|MB_TYPE_16x8)) | |
1581 && !is_b8x8) | |
1582 *mb_type |= MB_TYPE_16x16; | |
1583 else | |
1584 *mb_type |= MB_TYPE_8x8; | |
1585 } | |
1586 | |
1587 for(i8=0; i8<4; i8++){ | |
1588 const int x8 = i8&1; | |
1589 const int y8 = i8>>1; | |
1590 int ref0, scale; | |
1591 const int16_t (*l1mv)[2]= l1mv0; | |
1592 | |
1593 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
1594 continue; | |
1595 h->sub_mb_type[i8] = sub_mb_type; | |
1596 | |
1597 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); | |
1598 if(IS_INTRA(mb_types_col[y8])){ | |
1599 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1); | |
1600 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1601 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1602 continue; | |
1603 } | |
1604 | |
1605 ref0 = l1ref0[x8 + (y8*2>>y_shift)*h->b8_stride]; | |
1606 if(ref0 >= 0) | |
1607 ref0 = map_col_to_list0[0][ref0*2>>y_shift]; | |
1608 else{ | |
1609 ref0 = map_col_to_list0[1][l1ref1[x8 + (y8*2>>y_shift)*h->b8_stride]*2>>y_shift]; | |
1610 l1mv= l1mv1; | |
1611 } | |
1612 scale = dist_scale_factor[ref0]; | |
1613 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1); | |
1614 | |
1615 { | |
1616 const int16_t *mv_col = l1mv[x8*3 + (y8*6>>y_shift)*h->b_stride]; | |
1617 int my_col = (mv_col[1]<<y_shift)/2; | |
1618 int mx = (scale * mv_col[0] + 128) >> 8; | |
1619 int my = (scale * my_col + 128) >> 8; | |
1620 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4); | |
1621 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-my_col), 4); | |
1622 } | |
1623 } | |
1624 return; | |
1625 } | |
1626 } | |
1627 | |
1628 /* one-to-one mv scaling */ | |
1629 | |
2396 | 1630 if(IS_16X16(*mb_type)){ |
1631 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, 0, 1); | |
1632 if(IS_INTRA(mb_type_col)){ | |
1633 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
1634 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
1635 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
1636 }else{ | |
3316 | 1637 const int ref0 = l1ref0[0] >= 0 ? map_col_to_list0[0][l1ref0[0]] |
1638 : map_col_to_list0[1][l1ref1[0]]; | |
1639 const int scale = dist_scale_factor[ref0]; | |
2809
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
1640 const int16_t *mv_col = l1ref0[0] >= 0 ? l1mv0[0] : l1mv1[0]; |
2396 | 1641 int mv_l0[2]; |
3316 | 1642 mv_l0[0] = (scale * mv_col[0] + 128) >> 8; |
1643 mv_l0[1] = (scale * mv_col[1] + 128) >> 8; | |
2396 | 1644 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref0, 1); |
1645 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv_l0[0],mv_l0[1]), 4); | |
1646 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); | |
1647 } | |
1648 }else{ | |
1649 for(i8=0; i8<4; i8++){ | |
1650 const int x8 = i8&1; | |
1651 const int y8 = i8>>1; | |
3316 | 1652 int ref0, scale; |
2834 | 1653 const int16_t (*l1mv)[2]= l1mv0; |
2809
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
1654 |
2396 | 1655 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) |
1656 continue; | |
1657 h->sub_mb_type[i8] = sub_mb_type; | |
3316 | 1658 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); |
2396 | 1659 if(IS_INTRA(mb_type_col)){ |
1660 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1); | |
1661 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1662 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
1663 continue; | |
1664 } | |
2967 | 1665 |
2396 | 1666 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
|
1667 if(ref0 >= 0) |
3316 | 1668 ref0 = map_col_to_list0[0][ref0]; |
2809
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
1669 else{ |
3316 | 1670 ref0 = map_col_to_list0[1][l1ref1[x8 + y8*h->b8_stride]]; |
2809
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
1671 l1mv= l1mv1; |
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
1672 } |
3316 | 1673 scale = dist_scale_factor[ref0]; |
2967 | 1674 |
2396 | 1675 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1); |
3002 | 1676 if(IS_SUB_8X8(sub_mb_type)){ |
1677 const int16_t *mv_col = l1mv[x8*3 + y8*3*h->b_stride]; | |
3316 | 1678 int mx = (scale * mv_col[0] + 128) >> 8; |
1679 int my = (scale * mv_col[1] + 128) >> 8; | |
3002 | 1680 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4); |
1681 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-mv_col[1]), 4); | |
1682 }else | |
2396 | 1683 for(i4=0; i4<4; i4++){ |
2809
75400dfbe117
fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents:
2808
diff
changeset
|
1684 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; |
2396 | 1685 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]]; |
3316 | 1686 mv_l0[0] = (scale * mv_col[0] + 128) >> 8; |
1687 mv_l0[1] = (scale * mv_col[1] + 128) >> 8; | |
2396 | 1688 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = |
1689 pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]); | |
1690 } | |
1691 } | |
1692 } | |
1693 } | |
1694 } | |
1695 | |
1168 | 1696 static inline void write_back_motion(H264Context *h, int mb_type){ |
1697 MpegEncContext * const s = &h->s; | |
1698 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
1699 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
1700 int list; | |
1701 | |
3219
cf233efbcece
10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents:
3215
diff
changeset
|
1702 if(!USES_LIST(mb_type, 0)) |
cf233efbcece
10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents:
3215
diff
changeset
|
1703 fill_rectangle(&s->current_picture.ref_index[0][b8_xy], 2, 2, h->b8_stride, (uint8_t)LIST_NOT_USED, 1); |
cf233efbcece
10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents:
3215
diff
changeset
|
1704 |
1168 | 1705 for(list=0; list<2; list++){ |
1706 int y; | |
3212 | 1707 if(!USES_LIST(mb_type, list)) |
2396 | 1708 continue; |
2967 | 1709 |
1168 | 1710 for(y=0; y<4; y++){ |
1711 *(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]; | |
1712 *(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]; | |
1713 } | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1714 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
|
1715 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
|
1716 *(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
|
1717 *(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
|
1718 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1719 } |
3212 | 1720 |
1721 { | |
1722 uint8_t *ref_index = &s->current_picture.ref_index[list][b8_xy]; | |
1723 ref_index[0+0*h->b8_stride]= h->ref_cache[list][scan8[0]]; | |
1724 ref_index[1+0*h->b8_stride]= h->ref_cache[list][scan8[4]]; | |
1725 ref_index[0+1*h->b8_stride]= h->ref_cache[list][scan8[8]]; | |
1726 ref_index[1+1*h->b8_stride]= h->ref_cache[list][scan8[12]]; | |
1168 | 1727 } |
1728 } | |
2967 | 1729 |
2396 | 1730 if(h->slice_type == B_TYPE && h->pps.cabac){ |
1731 if(IS_8X8(mb_type)){ | |
3212 | 1732 uint8_t *direct_table = &h->direct_table[b8_xy]; |
1733 direct_table[1+0*h->b8_stride] = IS_DIRECT(h->sub_mb_type[1]) ? 1 : 0; | |
1734 direct_table[0+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[2]) ? 1 : 0; | |
1735 direct_table[1+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[3]) ? 1 : 0; | |
2396 | 1736 } |
1737 } | |
1168 | 1738 } |
1739 | |
1740 /** | |
1741 * Decodes a network abstraction layer unit. | |
1742 * @param consumed is the number of bytes used as input | |
1743 * @param length is the length of the array | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
1744 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing? |
2967 | 1745 * @returns decoded bytes, might be src+1 if no escapes |
1168 | 1746 */ |
1747 static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *consumed, int length){ | |
1748 int i, si, di; | |
1749 uint8_t *dst; | |
1750 | |
2979 | 1751 // src[0]&0x80; //forbidden bit |
1168 | 1752 h->nal_ref_idc= src[0]>>5; |
1753 h->nal_unit_type= src[0]&0x1F; | |
1754 | |
1755 src++; length--; | |
2967 | 1756 #if 0 |
1168 | 1757 for(i=0; i<length; i++) |
1758 printf("%2X ", src[i]); | |
1759 #endif | |
1760 for(i=0; i+1<length; i+=2){ | |
1761 if(src[i]) continue; | |
1762 if(i>0 && src[i-1]==0) i--; | |
1763 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
1764 if(src[i+2]!=3){ | |
1765 /* startcode, so we must be past the end */ | |
1766 length=i; | |
1767 } | |
1768 break; | |
1769 } | |
1770 } | |
1771 | |
1772 if(i>=length-1){ //no escaped 0 | |
1773 *dst_length= length; | |
1774 *consumed= length+1; //+1 for the header | |
2967 | 1775 return src; |
1168 | 1776 } |
1777 | |
1778 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length); | |
1779 dst= h->rbsp_buffer; | |
1780 | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
1781 //printf("decoding esc\n"); |
1168 | 1782 si=di=0; |
2967 | 1783 while(si<length){ |
1168 | 1784 //remove escapes (very rare 1:2^22) |
1785 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
1786 if(src[si+2]==3){ //escape | |
1787 dst[di++]= 0; | |
1788 dst[di++]= 0; | |
1789 si+=3; | |
1957
54411768fa38
h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1956
diff
changeset
|
1790 continue; |
1168 | 1791 }else //next start code |
1792 break; | |
1793 } | |
1794 | |
1795 dst[di++]= src[si++]; | |
1796 } | |
1797 | |
1798 *dst_length= di; | |
1799 *consumed= si + 1;//+1 for the header | |
1800 //FIXME store exact number of bits in the getbitcontext (its needed for decoding) | |
1801 return dst; | |
1802 } | |
1803 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1804 #if 0 |
1168 | 1805 /** |
1806 * @param src the data which should be escaped | |
1807 * @param dst the target buffer, dst+1 == src is allowed as a special case | |
1808 * @param length the length of the src data | |
1809 * @param dst_length the length of the dst array | |
1810 * @returns length of escaped data in bytes or -1 if an error occured | |
1811 */ | |
1812 static int encode_nal(H264Context *h, uint8_t *dst, uint8_t *src, int length, int dst_length){ | |
1813 int i, escape_count, si, di; | |
1814 uint8_t *temp; | |
2967 | 1815 |
1168 | 1816 assert(length>=0); |
1817 assert(dst_length>0); | |
2967 | 1818 |
1168 | 1819 dst[0]= (h->nal_ref_idc<<5) + h->nal_unit_type; |
1820 | |
1821 if(length==0) return 1; | |
1822 | |
1823 escape_count= 0; | |
1824 for(i=0; i<length; i+=2){ | |
1825 if(src[i]) continue; | |
2967 | 1826 if(i>0 && src[i-1]==0) |
1168 | 1827 i--; |
1828 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
1829 escape_count++; | |
1830 i+=2; | |
1831 } | |
1832 } | |
2967 | 1833 |
1834 if(escape_count==0){ | |
1168 | 1835 if(dst+1 != src) |
1836 memcpy(dst+1, src, length); | |
1837 return length + 1; | |
1838 } | |
2967 | 1839 |
1168 | 1840 if(length + escape_count + 1> dst_length) |
1841 return -1; | |
1842 | |
1843 //this should be damn rare (hopefully) | |
1844 | |
1845 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length + escape_count); | |
1846 temp= h->rbsp_buffer; | |
1847 //printf("encoding esc\n"); | |
2967 | 1848 |
1168 | 1849 si= 0; |
1850 di= 0; | |
1851 while(si < length){ | |
1852 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
1853 temp[di++]= 0; si++; | |
1854 temp[di++]= 0; si++; | |
2967 | 1855 temp[di++]= 3; |
1168 | 1856 temp[di++]= src[si++]; |
1857 } | |
1858 else | |
1859 temp[di++]= src[si++]; | |
1860 } | |
1861 memcpy(dst+1, temp, length+escape_count); | |
2967 | 1862 |
1168 | 1863 assert(di == length+escape_count); |
2967 | 1864 |
1168 | 1865 return di + 1; |
1866 } | |
1867 | |
1868 /** | |
1869 * write 1,10,100,1000,... for alignment, yes its exactly inverse to mpeg4 | |
1870 */ | |
1871 static void encode_rbsp_trailing(PutBitContext *pb){ | |
1872 int length; | |
1873 put_bits(pb, 1, 1); | |
1786 | 1874 length= (-put_bits_count(pb))&7; |
1168 | 1875 if(length) put_bits(pb, length, 0); |
1876 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1877 #endif |
1168 | 1878 |
1879 /** | |
1880 * identifies the exact end of the bitstream | |
1881 * @return the length of the trailing, or 0 if damaged | |
1882 */ | |
1883 static int decode_rbsp_trailing(uint8_t *src){ | |
1884 int v= *src; | |
1885 int r; | |
1886 | |
1170 | 1887 tprintf("rbsp trailing %X\n", v); |
1168 | 1888 |
1889 for(r=1; r<9; r++){ | |
1890 if(v&1) return r; | |
1891 v>>=1; | |
1892 } | |
1893 return 0; | |
1894 } | |
1895 | |
1896 /** | |
1897 * idct tranforms the 16 dc values and dequantize them. | |
1898 * @param qp quantization parameter | |
1899 */ | |
2919 | 1900 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){ |
1168 | 1901 #define stride 16 |
1902 int i; | |
1903 int temp[16]; //FIXME check if this is a good idea | |
1904 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
1905 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
1906 | |
1907 //memset(block, 64, 2*256); | |
1908 //return; | |
1909 for(i=0; i<4; i++){ | |
1910 const int offset= y_offset[i]; | |
1911 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
1912 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
1913 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
1914 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
1915 | |
1916 temp[4*i+0]= z0+z3; | |
1917 temp[4*i+1]= z1+z2; | |
1918 temp[4*i+2]= z1-z2; | |
1919 temp[4*i+3]= z0-z3; | |
1920 } | |
1921 | |
1922 for(i=0; i<4; i++){ | |
1923 const int offset= x_offset[i]; | |
1924 const int z0= temp[4*0+i] + temp[4*2+i]; | |
1925 const int z1= temp[4*0+i] - temp[4*2+i]; | |
1926 const int z2= temp[4*1+i] - temp[4*3+i]; | |
1927 const int z3= temp[4*1+i] + temp[4*3+i]; | |
1928 | |
2919 | 1929 block[stride*0 +offset]= ((((z0 + z3)*qmul + 128 ) >> 8)); //FIXME think about merging this into decode_resdual |
1930 block[stride*2 +offset]= ((((z1 + z2)*qmul + 128 ) >> 8)); | |
1931 block[stride*8 +offset]= ((((z1 - z2)*qmul + 128 ) >> 8)); | |
1932 block[stride*10+offset]= ((((z0 - z3)*qmul + 128 ) >> 8)); | |
1168 | 1933 } |
1934 } | |
1935 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1936 #if 0 |
1168 | 1937 /** |
1938 * dct tranforms the 16 dc values. | |
1939 * @param qp quantization parameter ??? FIXME | |
1940 */ | |
1941 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){ | |
1942 // const int qmul= dequant_coeff[qp][0]; | |
1943 int i; | |
1944 int temp[16]; //FIXME check if this is a good idea | |
1945 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
1946 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
1947 | |
1948 for(i=0; i<4; i++){ | |
1949 const int offset= y_offset[i]; | |
1950 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
1951 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
1952 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
1953 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
1954 | |
1955 temp[4*i+0]= z0+z3; | |
1956 temp[4*i+1]= z1+z2; | |
1957 temp[4*i+2]= z1-z2; | |
1958 temp[4*i+3]= z0-z3; | |
1959 } | |
1960 | |
1961 for(i=0; i<4; i++){ | |
1962 const int offset= x_offset[i]; | |
1963 const int z0= temp[4*0+i] + temp[4*2+i]; | |
1964 const int z1= temp[4*0+i] - temp[4*2+i]; | |
1965 const int z2= temp[4*1+i] - temp[4*3+i]; | |
1966 const int z3= temp[4*1+i] + temp[4*3+i]; | |
1967 | |
1968 block[stride*0 +offset]= (z0 + z3)>>1; | |
1969 block[stride*2 +offset]= (z1 + z2)>>1; | |
1970 block[stride*8 +offset]= (z1 - z2)>>1; | |
1971 block[stride*10+offset]= (z0 - z3)>>1; | |
1972 } | |
1973 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1974 #endif |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1975 |
1168 | 1976 #undef xStride |
1977 #undef stride | |
1978 | |
2919 | 1979 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){ |
1168 | 1980 const int stride= 16*2; |
1981 const int xStride= 16; | |
1982 int a,b,c,d,e; | |
1983 | |
1984 a= block[stride*0 + xStride*0]; | |
1985 b= block[stride*0 + xStride*1]; | |
1986 c= block[stride*1 + xStride*0]; | |
1987 d= block[stride*1 + xStride*1]; | |
1988 | |
1989 e= a-b; | |
1990 a= a+b; | |
1991 b= c-d; | |
1992 c= c+d; | |
1993 | |
2919 | 1994 block[stride*0 + xStride*0]= ((a+c)*qmul) >> 7; |
1995 block[stride*0 + xStride*1]= ((e+b)*qmul) >> 7; | |
1996 block[stride*1 + xStride*0]= ((a-c)*qmul) >> 7; | |
1997 block[stride*1 + xStride*1]= ((e-b)*qmul) >> 7; | |
1168 | 1998 } |
1999 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2000 #if 0 |
1168 | 2001 static void chroma_dc_dct_c(DCTELEM *block){ |
2002 const int stride= 16*2; | |
2003 const int xStride= 16; | |
2004 int a,b,c,d,e; | |
2005 | |
2006 a= block[stride*0 + xStride*0]; | |
2007 b= block[stride*0 + xStride*1]; | |
2008 c= block[stride*1 + xStride*0]; | |
2009 d= block[stride*1 + xStride*1]; | |
2010 | |
2011 e= a-b; | |
2012 a= a+b; | |
2013 b= c-d; | |
2014 c= c+d; | |
2015 | |
2016 block[stride*0 + xStride*0]= (a+c); | |
2017 block[stride*0 + xStride*1]= (e+b); | |
2018 block[stride*1 + xStride*0]= (a-c); | |
2019 block[stride*1 + xStride*1]= (e-b); | |
2020 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2021 #endif |
1168 | 2022 |
2023 /** | |
2024 * gets the chroma qp. | |
2025 */ | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2026 static inline int get_chroma_qp(int chroma_qp_index_offset, int qscale){ |
2967 | 2027 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2028 return chroma_qp[clip(qscale + chroma_qp_index_offset, 0, 51)]; |
1168 | 2029 } |
2030 | |
2031 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2032 #if 0 |
1168 | 2033 static void h264_diff_dct_c(DCTELEM *block, uint8_t *src1, uint8_t *src2, int stride){ |
2034 int i; | |
2035 //FIXME try int temp instead of block | |
2967 | 2036 |
1168 | 2037 for(i=0; i<4; i++){ |
2038 const int d0= src1[0 + i*stride] - src2[0 + i*stride]; | |
2039 const int d1= src1[1 + i*stride] - src2[1 + i*stride]; | |
2040 const int d2= src1[2 + i*stride] - src2[2 + i*stride]; | |
2041 const int d3= src1[3 + i*stride] - src2[3 + i*stride]; | |
2042 const int z0= d0 + d3; | |
2043 const int z3= d0 - d3; | |
2044 const int z1= d1 + d2; | |
2045 const int z2= d1 - d2; | |
2967 | 2046 |
1168 | 2047 block[0 + 4*i]= z0 + z1; |
2048 block[1 + 4*i]= 2*z3 + z2; | |
2049 block[2 + 4*i]= z0 - z1; | |
2050 block[3 + 4*i]= z3 - 2*z2; | |
2967 | 2051 } |
1168 | 2052 |
2053 for(i=0; i<4; i++){ | |
2054 const int z0= block[0*4 + i] + block[3*4 + i]; | |
2055 const int z3= block[0*4 + i] - block[3*4 + i]; | |
2056 const int z1= block[1*4 + i] + block[2*4 + i]; | |
2057 const int z2= block[1*4 + i] - block[2*4 + i]; | |
2967 | 2058 |
1168 | 2059 block[0*4 + i]= z0 + z1; |
2060 block[1*4 + i]= 2*z3 + z2; | |
2061 block[2*4 + i]= z0 - z1; | |
2062 block[3*4 + i]= z3 - 2*z2; | |
2063 } | |
2064 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2065 #endif |
1168 | 2066 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
2067 //FIXME need to check that this doesnt overflow signed 32 bit for low qp, i am not sure, it's very close |
1168 | 2068 //FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away) |
2069 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int seperate_dc){ | |
2070 int i; | |
2071 const int * const quant_table= quant_coeff[qscale]; | |
2072 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6; | |
2073 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1; | |
2074 const unsigned int threshold2= (threshold1<<1); | |
2075 int last_non_zero; | |
2076 | |
2077 if(seperate_dc){ | |
2078 if(qscale<=18){ | |
2079 //avoid overflows | |
2080 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6; | |
2081 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1; | |
2082 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
2083 | |
2084 int level= block[0]*quant_coeff[qscale+18][0]; | |
2085 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
2086 if(level>0){ | |
2087 level= (dc_bias + level)>>(QUANT_SHIFT-2); | |
2088 block[0]= level; | |
2089 }else{ | |
2090 level= (dc_bias - level)>>(QUANT_SHIFT-2); | |
2091 block[0]= -level; | |
2092 } | |
2093 // last_non_zero = i; | |
2094 }else{ | |
2095 block[0]=0; | |
2096 } | |
2097 }else{ | |
2098 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6; | |
2099 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1; | |
2100 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
2101 | |
2102 int level= block[0]*quant_table[0]; | |
2103 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
2104 if(level>0){ | |
2105 level= (dc_bias + level)>>(QUANT_SHIFT+1); | |
2106 block[0]= level; | |
2107 }else{ | |
2108 level= (dc_bias - level)>>(QUANT_SHIFT+1); | |
2109 block[0]= -level; | |
2110 } | |
2111 // last_non_zero = i; | |
2112 }else{ | |
2113 block[0]=0; | |
2114 } | |
2115 } | |
2116 last_non_zero= 0; | |
2117 i=1; | |
2118 }else{ | |
2119 last_non_zero= -1; | |
2120 i=0; | |
2121 } | |
2122 | |
2123 for(; i<16; i++){ | |
2124 const int j= scantable[i]; | |
2125 int level= block[j]*quant_table[j]; | |
2126 | |
2127 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
2128 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
2129 if(((unsigned)(level+threshold1))>threshold2){ | |
2130 if(level>0){ | |
2131 level= (bias + level)>>QUANT_SHIFT; | |
2132 block[j]= level; | |
2133 }else{ | |
2134 level= (bias - level)>>QUANT_SHIFT; | |
2135 block[j]= -level; | |
2136 } | |
2137 last_non_zero = i; | |
2138 }else{ | |
2139 block[j]=0; | |
2140 } | |
2141 } | |
2142 | |
2143 return last_non_zero; | |
2144 } | |
2145 | |
2146 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){ | |
2147 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
2148 ((uint32_t*)(src+0*stride))[0]= a; | |
2149 ((uint32_t*)(src+1*stride))[0]= a; | |
2150 ((uint32_t*)(src+2*stride))[0]= a; | |
2151 ((uint32_t*)(src+3*stride))[0]= a; | |
2152 } | |
2153 | |
2154 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){ | |
2155 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101; | |
2156 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101; | |
2157 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101; | |
2158 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101; | |
2159 } | |
2160 | |
2161 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
2162 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] | |
2163 + src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 4) >>3; | |
2967 | 2164 |
2165 ((uint32_t*)(src+0*stride))[0]= | |
2166 ((uint32_t*)(src+1*stride))[0]= | |
2167 ((uint32_t*)(src+2*stride))[0]= | |
2168 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
1168 | 2169 } |
2170 | |
2171 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
2172 const int dc= ( src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 2) >>2; | |
2967 | 2173 |
2174 ((uint32_t*)(src+0*stride))[0]= | |
2175 ((uint32_t*)(src+1*stride))[0]= | |
2176 ((uint32_t*)(src+2*stride))[0]= | |
2177 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
1168 | 2178 } |
2179 | |
2180 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
2181 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2; | |
2967 | 2182 |
2183 ((uint32_t*)(src+0*stride))[0]= | |
2184 ((uint32_t*)(src+1*stride))[0]= | |
2185 ((uint32_t*)(src+2*stride))[0]= | |
2186 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
1168 | 2187 } |
2188 | |
2189 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
2967 | 2190 ((uint32_t*)(src+0*stride))[0]= |
2191 ((uint32_t*)(src+1*stride))[0]= | |
2192 ((uint32_t*)(src+2*stride))[0]= | |
1168 | 2193 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U; |
2194 } | |
2195 | |
2196 | |
2197 #define LOAD_TOP_RIGHT_EDGE\ | |
2198 const int t4= topright[0];\ | |
2199 const int t5= topright[1];\ | |
2200 const int t6= topright[2];\ | |
2201 const int t7= topright[3];\ | |
2202 | |
2203 #define LOAD_LEFT_EDGE\ | |
2204 const int l0= src[-1+0*stride];\ | |
2205 const int l1= src[-1+1*stride];\ | |
2206 const int l2= src[-1+2*stride];\ | |
2207 const int l3= src[-1+3*stride];\ | |
2208 | |
2209 #define LOAD_TOP_EDGE\ | |
2210 const int t0= src[ 0-1*stride];\ | |
2211 const int t1= src[ 1-1*stride];\ | |
2212 const int t2= src[ 2-1*stride];\ | |
2213 const int t3= src[ 3-1*stride];\ | |
2214 | |
2215 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
2216 const int lt= src[-1-1*stride]; | |
2217 LOAD_TOP_EDGE | |
2218 LOAD_LEFT_EDGE | |
2219 | |
2967 | 2220 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2; |
1168 | 2221 src[0+2*stride]= |
2967 | 2222 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2; |
1168 | 2223 src[0+1*stride]= |
2224 src[1+2*stride]= | |
2967 | 2225 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2; |
1168 | 2226 src[0+0*stride]= |
2227 src[1+1*stride]= | |
2228 src[2+2*stride]= | |
2967 | 2229 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2; |
1168 | 2230 src[1+0*stride]= |
2231 src[2+1*stride]= | |
2232 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
2233 src[2+0*stride]= | |
2234 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
2235 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
1282 | 2236 } |
1168 | 2237 |
2238 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
2967 | 2239 LOAD_TOP_EDGE |
2240 LOAD_TOP_RIGHT_EDGE | |
2241 // LOAD_LEFT_EDGE | |
1168 | 2242 |
2243 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2; | |
2244 src[1+0*stride]= | |
2245 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2; | |
2246 src[2+0*stride]= | |
2247 src[1+1*stride]= | |
2248 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2; | |
2249 src[3+0*stride]= | |
2250 src[2+1*stride]= | |
2251 src[1+2*stride]= | |
2252 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2; | |
2253 src[3+1*stride]= | |
2254 src[2+2*stride]= | |
2255 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2; | |
2256 src[3+2*stride]= | |
2257 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2; | |
2258 src[3+3*stride]=(t6 + 3*t7 + 2)>>2; | |
1282 | 2259 } |
1168 | 2260 |
2261 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
2262 const int lt= src[-1-1*stride]; | |
2967 | 2263 LOAD_TOP_EDGE |
2264 LOAD_LEFT_EDGE | |
1168 | 2265 const __attribute__((unused)) int unu= l3; |
2266 | |
2267 src[0+0*stride]= | |
2268 src[1+2*stride]=(lt + t0 + 1)>>1; | |
2269 src[1+0*stride]= | |
2270 src[2+2*stride]=(t0 + t1 + 1)>>1; | |
2271 src[2+0*stride]= | |
2272 src[3+2*stride]=(t1 + t2 + 1)>>1; | |
2273 src[3+0*stride]=(t2 + t3 + 1)>>1; | |
2274 src[0+1*stride]= | |
2275 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
2276 src[1+1*stride]= | |
2277 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
2278 src[2+1*stride]= | |
2279 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
2280 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
2281 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
2282 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
1282 | 2283 } |
1168 | 2284 |
2285 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
2967 | 2286 LOAD_TOP_EDGE |
2287 LOAD_TOP_RIGHT_EDGE | |
1168 | 2288 const __attribute__((unused)) int unu= t7; |
2289 | |
2290 src[0+0*stride]=(t0 + t1 + 1)>>1; | |
2291 src[1+0*stride]= | |
2292 src[0+2*stride]=(t1 + t2 + 1)>>1; | |
2293 src[2+0*stride]= | |
2294 src[1+2*stride]=(t2 + t3 + 1)>>1; | |
2295 src[3+0*stride]= | |
2296 src[2+2*stride]=(t3 + t4+ 1)>>1; | |
2297 src[3+2*stride]=(t4 + t5+ 1)>>1; | |
2298 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
2299 src[1+1*stride]= | |
2300 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
2301 src[2+1*stride]= | |
2302 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2; | |
2303 src[3+1*stride]= | |
2304 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; | |
2305 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; | |
1282 | 2306 } |
1168 | 2307 |
2308 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ | |
2967 | 2309 LOAD_LEFT_EDGE |
1168 | 2310 |
2311 src[0+0*stride]=(l0 + l1 + 1)>>1; | |
2312 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
2313 src[2+0*stride]= | |
2314 src[0+1*stride]=(l1 + l2 + 1)>>1; | |
2315 src[3+0*stride]= | |
2316 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
2317 src[2+1*stride]= | |
2318 src[0+2*stride]=(l2 + l3 + 1)>>1; | |
2319 src[3+1*stride]= | |
2320 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2; | |
2321 src[3+2*stride]= | |
2322 src[1+3*stride]= | |
2323 src[0+3*stride]= | |
2324 src[2+2*stride]= | |
2325 src[2+3*stride]= | |
2326 src[3+3*stride]=l3; | |
1282 | 2327 } |
2967 | 2328 |
1168 | 2329 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){ |
2330 const int lt= src[-1-1*stride]; | |
2967 | 2331 LOAD_TOP_EDGE |
2332 LOAD_LEFT_EDGE | |
1168 | 2333 const __attribute__((unused)) int unu= t3; |
2334 | |
2335 src[0+0*stride]= | |
2336 src[2+1*stride]=(lt + l0 + 1)>>1; | |
2337 src[1+0*stride]= | |
2338 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
2339 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
2340 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
2341 src[0+1*stride]= | |
2342 src[2+2*stride]=(l0 + l1 + 1)>>1; | |
2343 src[1+1*stride]= | |
2344 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
2345 src[0+2*stride]= | |
2346 src[2+3*stride]=(l1 + l2+ 1)>>1; | |
2347 src[1+2*stride]= | |
2348 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
2349 src[0+3*stride]=(l2 + l3 + 1)>>1; | |
2350 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
1282 | 2351 } |
1168 | 2352 |
2353 static void pred16x16_vertical_c(uint8_t *src, int stride){ | |
2354 int i; | |
2355 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
2356 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
2357 const uint32_t c= ((uint32_t*)(src-stride))[2]; | |
2358 const uint32_t d= ((uint32_t*)(src-stride))[3]; | |
2967 | 2359 |
1168 | 2360 for(i=0; i<16; i++){ |
2361 ((uint32_t*)(src+i*stride))[0]= a; | |
2362 ((uint32_t*)(src+i*stride))[1]= b; | |
2363 ((uint32_t*)(src+i*stride))[2]= c; | |
2364 ((uint32_t*)(src+i*stride))[3]= d; | |
2365 } | |
2366 } | |
2367 | |
2368 static void pred16x16_horizontal_c(uint8_t *src, int stride){ | |
2369 int i; | |
2370 | |
2371 for(i=0; i<16; i++){ | |
2372 ((uint32_t*)(src+i*stride))[0]= | |
2373 ((uint32_t*)(src+i*stride))[1]= | |
2374 ((uint32_t*)(src+i*stride))[2]= | |
2375 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101; | |
2376 } | |
2377 } | |
2378 | |
2379 static void pred16x16_dc_c(uint8_t *src, int stride){ | |
2380 int i, dc=0; | |
2381 | |
2382 for(i=0;i<16; i++){ | |
2383 dc+= src[-1+i*stride]; | |
2384 } | |
2967 | 2385 |
1168 | 2386 for(i=0;i<16; i++){ |
2387 dc+= src[i-stride]; | |
2388 } | |
2389 | |
2390 dc= 0x01010101*((dc + 16)>>5); | |
2391 | |
2392 for(i=0; i<16; i++){ | |
2393 ((uint32_t*)(src+i*stride))[0]= | |
2394 ((uint32_t*)(src+i*stride))[1]= | |
2395 ((uint32_t*)(src+i*stride))[2]= | |
2396 ((uint32_t*)(src+i*stride))[3]= dc; | |
2397 } | |
2398 } | |
2399 | |
2400 static void pred16x16_left_dc_c(uint8_t *src, int stride){ | |
2401 int i, dc=0; | |
2402 | |
2403 for(i=0;i<16; i++){ | |
2404 dc+= src[-1+i*stride]; | |
2405 } | |
2967 | 2406 |
1168 | 2407 dc= 0x01010101*((dc + 8)>>4); |
2408 | |
2409 for(i=0; i<16; i++){ | |
2410 ((uint32_t*)(src+i*stride))[0]= | |
2411 ((uint32_t*)(src+i*stride))[1]= | |
2412 ((uint32_t*)(src+i*stride))[2]= | |
2413 ((uint32_t*)(src+i*stride))[3]= dc; | |
2414 } | |
2415 } | |
2416 | |
2417 static void pred16x16_top_dc_c(uint8_t *src, int stride){ | |
2418 int i, dc=0; | |
2419 | |
2420 for(i=0;i<16; i++){ | |
2421 dc+= src[i-stride]; | |
2422 } | |
2423 dc= 0x01010101*((dc + 8)>>4); | |
2424 | |
2425 for(i=0; i<16; i++){ | |
2426 ((uint32_t*)(src+i*stride))[0]= | |
2427 ((uint32_t*)(src+i*stride))[1]= | |
2428 ((uint32_t*)(src+i*stride))[2]= | |
2429 ((uint32_t*)(src+i*stride))[3]= dc; | |
2430 } | |
2431 } | |
2432 | |
2433 static void pred16x16_128_dc_c(uint8_t *src, int stride){ | |
2434 int i; | |
2435 | |
2436 for(i=0; i<16; i++){ | |
2437 ((uint32_t*)(src+i*stride))[0]= | |
2438 ((uint32_t*)(src+i*stride))[1]= | |
2439 ((uint32_t*)(src+i*stride))[2]= | |
2440 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U; | |
2441 } | |
2442 } | |
2443 | |
1234 | 2444 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
|
2445 int i, j, k; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2446 int a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2447 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
|
2448 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
|
2449 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
|
2450 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
|
2451 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
|
2452 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
|
2453 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
|
2454 src1 += stride; src2 -= stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2455 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
|
2456 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
|
2457 } |
1234 | 2458 if(svq3){ |
2459 H = ( 5*(H/4) ) / 16; | |
2460 V = ( 5*(V/4) ) / 16; | |
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2461 |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2462 /* required for 100% accuracy */ |
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2463 i = H; H = V; V = i; |
1234 | 2464 }else{ |
2465 H = ( 5*H+32 ) >> 6; | |
2466 V = ( 5*V+32 ) >> 6; | |
2467 } | |
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2468 |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2469 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
|
2470 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
|
2471 int b = a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2472 a += V; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2473 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
|
2474 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
|
2475 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
|
2476 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
|
2477 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
|
2478 b += 4*H; |
1168 | 2479 } |
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2480 src += stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2481 } |
1168 | 2482 } |
2483 | |
1234 | 2484 static void pred16x16_plane_c(uint8_t *src, int stride){ |
2485 pred16x16_plane_compat_c(src, stride, 0); | |
2486 } | |
2487 | |
1168 | 2488 static void pred8x8_vertical_c(uint8_t *src, int stride){ |
2489 int i; | |
2490 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
2491 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
2967 | 2492 |
1168 | 2493 for(i=0; i<8; i++){ |
2494 ((uint32_t*)(src+i*stride))[0]= a; | |
2495 ((uint32_t*)(src+i*stride))[1]= b; | |
2496 } | |
2497 } | |
2498 | |
2499 static void pred8x8_horizontal_c(uint8_t *src, int stride){ | |
2500 int i; | |
2501 | |
2502 for(i=0; i<8; i++){ | |
2503 ((uint32_t*)(src+i*stride))[0]= | |
2504 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101; | |
2505 } | |
2506 } | |
2507 | |
2508 static void pred8x8_128_dc_c(uint8_t *src, int stride){ | |
2509 int i; | |
2510 | |
2755 | 2511 for(i=0; i<8; i++){ |
2967 | 2512 ((uint32_t*)(src+i*stride))[0]= |
1168 | 2513 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; |
2514 } | |
2515 } | |
2516 | |
2517 static void pred8x8_left_dc_c(uint8_t *src, int stride){ | |
2518 int i; | |
2519 int dc0, dc2; | |
2520 | |
2521 dc0=dc2=0; | |
2522 for(i=0;i<4; i++){ | |
2523 dc0+= src[-1+i*stride]; | |
2524 dc2+= src[-1+(i+4)*stride]; | |
2525 } | |
2526 dc0= 0x01010101*((dc0 + 2)>>2); | |
2527 dc2= 0x01010101*((dc2 + 2)>>2); | |
2528 | |
2529 for(i=0; i<4; i++){ | |
2530 ((uint32_t*)(src+i*stride))[0]= | |
2531 ((uint32_t*)(src+i*stride))[1]= dc0; | |
2532 } | |
2533 for(i=4; i<8; i++){ | |
2534 ((uint32_t*)(src+i*stride))[0]= | |
2535 ((uint32_t*)(src+i*stride))[1]= dc2; | |
2536 } | |
2537 } | |
2538 | |
2539 static void pred8x8_top_dc_c(uint8_t *src, int stride){ | |
2540 int i; | |
2541 int dc0, dc1; | |
2542 | |
2543 dc0=dc1=0; | |
2544 for(i=0;i<4; i++){ | |
2545 dc0+= src[i-stride]; | |
2546 dc1+= src[4+i-stride]; | |
2547 } | |
2548 dc0= 0x01010101*((dc0 + 2)>>2); | |
2549 dc1= 0x01010101*((dc1 + 2)>>2); | |
2550 | |
2551 for(i=0; i<4; i++){ | |
2552 ((uint32_t*)(src+i*stride))[0]= dc0; | |
2553 ((uint32_t*)(src+i*stride))[1]= dc1; | |
2554 } | |
2555 for(i=4; i<8; i++){ | |
2556 ((uint32_t*)(src+i*stride))[0]= dc0; | |
2557 ((uint32_t*)(src+i*stride))[1]= dc1; | |
2558 } | |
2559 } | |
2560 | |
2561 | |
2562 static void pred8x8_dc_c(uint8_t *src, int stride){ | |
2563 int i; | |
2564 int dc0, dc1, dc2, dc3; | |
2565 | |
2566 dc0=dc1=dc2=0; | |
2567 for(i=0;i<4; i++){ | |
2568 dc0+= src[-1+i*stride] + src[i-stride]; | |
2569 dc1+= src[4+i-stride]; | |
2570 dc2+= src[-1+(i+4)*stride]; | |
2571 } | |
2572 dc3= 0x01010101*((dc1 + dc2 + 4)>>3); | |
2573 dc0= 0x01010101*((dc0 + 4)>>3); | |
2574 dc1= 0x01010101*((dc1 + 2)>>2); | |
2575 dc2= 0x01010101*((dc2 + 2)>>2); | |
2576 | |
2577 for(i=0; i<4; i++){ | |
2578 ((uint32_t*)(src+i*stride))[0]= dc0; | |
2579 ((uint32_t*)(src+i*stride))[1]= dc1; | |
2580 } | |
2581 for(i=4; i<8; i++){ | |
2582 ((uint32_t*)(src+i*stride))[0]= dc2; | |
2583 ((uint32_t*)(src+i*stride))[1]= dc3; | |
2584 } | |
2585 } | |
2586 | |
2587 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
|
2588 int j, k; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2589 int a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2590 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
|
2591 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
|
2592 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
|
2593 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
|
2594 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
|
2595 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
|
2596 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
|
2597 src1 += stride; src2 -= stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2598 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
|
2599 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
|
2600 } |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2601 H = ( 17*H+16 ) >> 5; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2602 V = ( 17*V+16 ) >> 5; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2603 |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2604 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
|
2605 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
|
2606 int b = a; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2607 a += V; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2608 src[0] = cm[ (b ) >> 5 ]; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2609 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
|
2610 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
|
2611 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
|
2612 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
|
2613 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
|
2614 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
|
2615 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
|
2616 src += stride; |
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2617 } |
1168 | 2618 } |
2619 | |
2755 | 2620 #define SRC(x,y) src[(x)+(y)*stride] |
2621 #define PL(y) \ | |
2622 const int l##y = (SRC(-1,y-1) + 2*SRC(-1,y) + SRC(-1,y+1) + 2) >> 2; | |
2623 #define PREDICT_8x8_LOAD_LEFT \ | |
2624 const int l0 = ((has_topleft ? SRC(-1,-1) : SRC(-1,0)) \ | |
2625 + 2*SRC(-1,0) + SRC(-1,1) + 2) >> 2; \ | |
2626 PL(1) PL(2) PL(3) PL(4) PL(5) PL(6) \ | |
2834 | 2627 const int l7 attribute_unused = (SRC(-1,6) + 3*SRC(-1,7) + 2) >> 2 |
2755 | 2628 |
2629 #define PT(x) \ | |
2630 const int t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2; | |
2631 #define PREDICT_8x8_LOAD_TOP \ | |
2632 const int t0 = ((has_topleft ? SRC(-1,-1) : SRC(0,-1)) \ | |
2633 + 2*SRC(0,-1) + SRC(1,-1) + 2) >> 2; \ | |
2634 PT(1) PT(2) PT(3) PT(4) PT(5) PT(6) \ | |
2834 | 2635 const int t7 attribute_unused = ((has_topright ? SRC(8,-1) : SRC(7,-1)) \ |
2757 | 2636 + 2*SRC(7,-1) + SRC(6,-1) + 2) >> 2 |
2755 | 2637 |
2638 #define PTR(x) \ | |
2639 t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2; | |
2640 #define PREDICT_8x8_LOAD_TOPRIGHT \ | |
2641 int t8, t9, t10, t11, t12, t13, t14, t15; \ | |
2642 if(has_topright) { \ | |
2643 PTR(8) PTR(9) PTR(10) PTR(11) PTR(12) PTR(13) PTR(14) \ | |
2644 t15 = (SRC(14,-1) + 3*SRC(15,-1) + 2) >> 2; \ | |
2645 } else t8=t9=t10=t11=t12=t13=t14=t15= SRC(7,-1); | |
2646 | |
2647 #define PREDICT_8x8_LOAD_TOPLEFT \ | |
2757 | 2648 const int lt = (SRC(-1,0) + 2*SRC(-1,-1) + SRC(0,-1) + 2) >> 2 |
2755 | 2649 |
2650 #define PREDICT_8x8_DC(v) \ | |
2651 int y; \ | |
2652 for( y = 0; y < 8; y++ ) { \ | |
2653 ((uint32_t*)src)[0] = \ | |
2654 ((uint32_t*)src)[1] = v; \ | |
2655 src += stride; \ | |
2656 } | |
2657 | |
2658 static void pred8x8l_128_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
2659 { | |
2660 PREDICT_8x8_DC(0x80808080); | |
2661 } | |
2662 static void pred8x8l_left_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
2663 { | |
2664 PREDICT_8x8_LOAD_LEFT; | |
2665 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7+4) >> 3) * 0x01010101; | |
2666 PREDICT_8x8_DC(dc); | |
2667 } | |
2668 static void pred8x8l_top_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
2669 { | |
2670 PREDICT_8x8_LOAD_TOP; | |
2671 const uint32_t dc = ((t0+t1+t2+t3+t4+t5+t6+t7+4) >> 3) * 0x01010101; | |
2672 PREDICT_8x8_DC(dc); | |
2673 } | |
2674 static void pred8x8l_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
2675 { | |
2676 PREDICT_8x8_LOAD_LEFT; | |
2677 PREDICT_8x8_LOAD_TOP; | |
2678 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7 | |
2679 +t0+t1+t2+t3+t4+t5+t6+t7+8) >> 4) * 0x01010101; | |
2680 PREDICT_8x8_DC(dc); | |
2681 } | |
2682 static void pred8x8l_horizontal_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
2683 { | |
2684 PREDICT_8x8_LOAD_LEFT; | |
2685 #define ROW(y) ((uint32_t*)(src+y*stride))[0] =\ | |
2686 ((uint32_t*)(src+y*stride))[1] = 0x01010101 * l##y | |
2687 ROW(0); ROW(1); ROW(2); ROW(3); ROW(4); ROW(5); ROW(6); ROW(7); | |
2688 #undef ROW | |
2689 } | |
2690 static void pred8x8l_vertical_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
2691 { | |
2692 int y; | |
2693 PREDICT_8x8_LOAD_TOP; | |
2694 src[0] = t0; | |
2695 src[1] = t1; | |
2696 src[2] = t2; | |
2697 src[3] = t3; | |
2698 src[4] = t4; | |
2699 src[5] = t5; | |
2700 src[6] = t6; | |
2701 src[7] = t7; | |
2702 for( y = 1; y < 8; y++ ) | |
2703 *(uint64_t*)(src+y*stride) = *(uint64_t*)src; | |
2704 } | |
2705 static void pred8x8l_down_left_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
2706 { | |
2707 PREDICT_8x8_LOAD_TOP; | |
2708 PREDICT_8x8_LOAD_TOPRIGHT; | |
2709 SRC(0,0)= (t0 + 2*t1 + t2 + 2) >> 2; | |
2710 SRC(0,1)=SRC(1,0)= (t1 + 2*t2 + t3 + 2) >> 2; | |
2711 SRC(0,2)=SRC(1,1)=SRC(2,0)= (t2 + 2*t3 + t4 + 2) >> 2; | |
2712 SRC(0,3)=SRC(1,2)=SRC(2,1)=SRC(3,0)= (t3 + 2*t4 + t5 + 2) >> 2; | |
2713 SRC(0,4)=SRC(1,3)=SRC(2,2)=SRC(3,1)=SRC(4,0)= (t4 + 2*t5 + t6 + 2) >> 2; | |
2714 SRC(0,5)=SRC(1,4)=SRC(2,3)=SRC(3,2)=SRC(4,1)=SRC(5,0)= (t5 + 2*t6 + t7 + 2) >> 2; | |
2715 SRC(0,6)=SRC(1,5)=SRC(2,4)=SRC(3,3)=SRC(4,2)=SRC(5,1)=SRC(6,0)= (t6 + 2*t7 + t8 + 2) >> 2; | |
2716 SRC(0,7)=SRC(1,6)=SRC(2,5)=SRC(3,4)=SRC(4,3)=SRC(5,2)=SRC(6,1)=SRC(7,0)= (t7 + 2*t8 + t9 + 2) >> 2; | |
2717 SRC(1,7)=SRC(2,6)=SRC(3,5)=SRC(4,4)=SRC(5,3)=SRC(6,2)=SRC(7,1)= (t8 + 2*t9 + t10 + 2) >> 2; | |
2718 SRC(2,7)=SRC(3,6)=SRC(4,5)=SRC(5,4)=SRC(6,3)=SRC(7,2)= (t9 + 2*t10 + t11 + 2) >> 2; | |
2719 SRC(3,7)=SRC(4,6)=SRC(5,5)=SRC(6,4)=SRC(7,3)= (t10 + 2*t11 + t12 + 2) >> 2; | |
2720 SRC(4,7)=SRC(5,6)=SRC(6,5)=SRC(7,4)= (t11 + 2*t12 + t13 + 2) >> 2; | |
2721 SRC(5,7)=SRC(6,6)=SRC(7,5)= (t12 + 2*t13 + t14 + 2) >> 2; | |
2722 SRC(6,7)=SRC(7,6)= (t13 + 2*t14 + t15 + 2) >> 2; | |
2723 SRC(7,7)= (t14 + 3*t15 + 2) >> 2; | |
2724 } | |
2725 static void pred8x8l_down_right_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
2726 { | |
2727 PREDICT_8x8_LOAD_TOP; | |
2728 PREDICT_8x8_LOAD_LEFT; | |
2729 PREDICT_8x8_LOAD_TOPLEFT; | |
2730 SRC(0,7)= (l7 + 2*l6 + l5 + 2) >> 2; | |
2731 SRC(0,6)=SRC(1,7)= (l6 + 2*l5 + l4 + 2) >> 2; | |
2732 SRC(0,5)=SRC(1,6)=SRC(2,7)= (l5 + 2*l4 + l3 + 2) >> 2; | |
2733 SRC(0,4)=SRC(1,5)=SRC(2,6)=SRC(3,7)= (l4 + 2*l3 + l2 + 2) >> 2; | |
2734 SRC(0,3)=SRC(1,4)=SRC(2,5)=SRC(3,6)=SRC(4,7)= (l3 + 2*l2 + l1 + 2) >> 2; | |
2735 SRC(0,2)=SRC(1,3)=SRC(2,4)=SRC(3,5)=SRC(4,6)=SRC(5,7)= (l2 + 2*l1 + l0 + 2) >> 2; | |
2736 SRC(0,1)=SRC(1,2)=SRC(2,3)=SRC(3,4)=SRC(4,5)=SRC(5,6)=SRC(6,7)= (l1 + 2*l0 + lt + 2) >> 2; | |
2737 SRC(0,0)=SRC(1,1)=SRC(2,2)=SRC(3,3)=SRC(4,4)=SRC(5,5)=SRC(6,6)=SRC(7,7)= (l0 + 2*lt + t0 + 2) >> 2; | |
2738 SRC(1,0)=SRC(2,1)=SRC(3,2)=SRC(4,3)=SRC(5,4)=SRC(6,5)=SRC(7,6)= (lt + 2*t0 + t1 + 2) >> 2; | |
2739 SRC(2,0)=SRC(3,1)=SRC(4,2)=SRC(5,3)=SRC(6,4)=SRC(7,5)= (t0 + 2*t1 + t2 + 2) >> 2; | |
2740 SRC(3,0)=SRC(4,1)=SRC(5,2)=SRC(6,3)=SRC(7,4)= (t1 + 2*t2 + t3 + 2) >> 2; | |
2741 SRC(4,0)=SRC(5,1)=SRC(6,2)=SRC(7,3)= (t2 + 2*t3 + t4 + 2) >> 2; | |
2742 SRC(5,0)=SRC(6,1)=SRC(7,2)= (t3 + 2*t4 + t5 + 2) >> 2; | |
2743 SRC(6,0)=SRC(7,1)= (t4 + 2*t5 + t6 + 2) >> 2; | |
2744 SRC(7,0)= (t5 + 2*t6 + t7 + 2) >> 2; | |
2967 | 2745 |
2755 | 2746 } |
2747 static void pred8x8l_vertical_right_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
2748 { | |
2749 PREDICT_8x8_LOAD_TOP; | |
2750 PREDICT_8x8_LOAD_LEFT; | |
2751 PREDICT_8x8_LOAD_TOPLEFT; | |
2752 SRC(0,6)= (l5 + 2*l4 + l3 + 2) >> 2; | |
2753 SRC(0,7)= (l6 + 2*l5 + l4 + 2) >> 2; | |
2754 SRC(0,4)=SRC(1,6)= (l3 + 2*l2 + l1 + 2) >> 2; | |
2755 SRC(0,5)=SRC(1,7)= (l4 + 2*l3 + l2 + 2) >> 2; | |
2756 SRC(0,2)=SRC(1,4)=SRC(2,6)= (l1 + 2*l0 + lt + 2) >> 2; | |
2757 SRC(0,3)=SRC(1,5)=SRC(2,7)= (l2 + 2*l1 + l0 + 2) >> 2; | |
2758 SRC(0,1)=SRC(1,3)=SRC(2,5)=SRC(3,7)= (l0 + 2*lt + t0 + 2) >> 2; | |
2759 SRC(0,0)=SRC(1,2)=SRC(2,4)=SRC(3,6)= (lt + t0 + 1) >> 1; | |
2760 SRC(1,1)=SRC(2,3)=SRC(3,5)=SRC(4,7)= (lt + 2*t0 + t1 + 2) >> 2; | |
2761 SRC(1,0)=SRC(2,2)=SRC(3,4)=SRC(4,6)= (t0 + t1 + 1) >> 1; | |
2762 SRC(2,1)=SRC(3,3)=SRC(4,5)=SRC(5,7)= (t0 + 2*t1 + t2 + 2) >> 2; | |
2763 SRC(2,0)=SRC(3,2)=SRC(4,4)=SRC(5,6)= (t1 + t2 + 1) >> 1; | |
2764 SRC(3,1)=SRC(4,3)=SRC(5,5)=SRC(6,7)= (t1 + 2*t2 + t3 + 2) >> 2; | |
2765 SRC(3,0)=SRC(4,2)=SRC(5,4)=SRC(6,6)= (t2 + t3 + 1) >> 1; | |
2766 SRC(4,1)=SRC(5,3)=SRC(6,5)=SRC(7,7)= (t2 + 2*t3 + t4 + 2) >> 2; | |
2767 SRC(4,0)=SRC(5,2)=SRC(6,4)=SRC(7,6)= (t3 + t4 + 1) >> 1; | |
2768 SRC(5,1)=SRC(6,3)=SRC(7,5)= (t3 + 2*t4 + t5 + 2) >> 2; | |
2769 SRC(5,0)=SRC(6,2)=SRC(7,4)= (t4 + t5 + 1) >> 1; | |
2770 SRC(6,1)=SRC(7,3)= (t4 + 2*t5 + t6 + 2) >> 2; | |
2771 SRC(6,0)=SRC(7,2)= (t5 + t6 + 1) >> 1; | |
2772 SRC(7,1)= (t5 + 2*t6 + t7 + 2) >> 2; | |
2773 SRC(7,0)= (t6 + t7 + 1) >> 1; | |
2774 } | |
2775 static void pred8x8l_horizontal_down_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
2776 { | |
2777 PREDICT_8x8_LOAD_TOP; | |
2778 PREDICT_8x8_LOAD_LEFT; | |
2779 PREDICT_8x8_LOAD_TOPLEFT; | |
2780 SRC(0,7)= (l6 + l7 + 1) >> 1; | |
2781 SRC(1,7)= (l5 + 2*l6 + l7 + 2) >> 2; | |
2782 SRC(0,6)=SRC(2,7)= (l5 + l6 + 1) >> 1; | |
2783 SRC(1,6)=SRC(3,7)= (l4 + 2*l5 + l6 + 2) >> 2; | |
2784 SRC(0,5)=SRC(2,6)=SRC(4,7)= (l4 + l5 + 1) >> 1; | |
2785 SRC(1,5)=SRC(3,6)=SRC(5,7)= (l3 + 2*l4 + l5 + 2) >> 2; | |
2786 SRC(0,4)=SRC(2,5)=SRC(4,6)=SRC(6,7)= (l3 + l4 + 1) >> 1; | |
2787 SRC(1,4)=SRC(3,5)=SRC(5,6)=SRC(7,7)= (l2 + 2*l3 + l4 + 2) >> 2; | |
2788 SRC(0,3)=SRC(2,4)=SRC(4,5)=SRC(6,6)= (l2 + l3 + 1) >> 1; | |
2789 SRC(1,3)=SRC(3,4)=SRC(5,5)=SRC(7,6)= (l1 + 2*l2 + l3 + 2) >> 2; | |
2790 SRC(0,2)=SRC(2,3)=SRC(4,4)=SRC(6,5)= (l1 + l2 + 1) >> 1; | |
2791 SRC(1,2)=SRC(3,3)=SRC(5,4)=SRC(7,5)= (l0 + 2*l1 + l2 + 2) >> 2; | |
2792 SRC(0,1)=SRC(2,2)=SRC(4,3)=SRC(6,4)= (l0 + l1 + 1) >> 1; | |
2793 SRC(1,1)=SRC(3,2)=SRC(5,3)=SRC(7,4)= (lt + 2*l0 + l1 + 2) >> 2; | |
2794 SRC(0,0)=SRC(2,1)=SRC(4,2)=SRC(6,3)= (lt + l0 + 1) >> 1; | |
2795 SRC(1,0)=SRC(3,1)=SRC(5,2)=SRC(7,3)= (l0 + 2*lt + t0 + 2) >> 2; | |
2796 SRC(2,0)=SRC(4,1)=SRC(6,2)= (t1 + 2*t0 + lt + 2) >> 2; | |
2797 SRC(3,0)=SRC(5,1)=SRC(7,2)= (t2 + 2*t1 + t0 + 2) >> 2; | |
2798 SRC(4,0)=SRC(6,1)= (t3 + 2*t2 + t1 + 2) >> 2; | |
2799 SRC(5,0)=SRC(7,1)= (t4 + 2*t3 + t2 + 2) >> 2; | |
2800 SRC(6,0)= (t5 + 2*t4 + t3 + 2) >> 2; | |
2801 SRC(7,0)= (t6 + 2*t5 + t4 + 2) >> 2; | |
2802 } | |
2803 static void pred8x8l_vertical_left_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
2804 { | |
2805 PREDICT_8x8_LOAD_TOP; | |
2806 PREDICT_8x8_LOAD_TOPRIGHT; | |
2807 SRC(0,0)= (t0 + t1 + 1) >> 1; | |
2808 SRC(0,1)= (t0 + 2*t1 + t2 + 2) >> 2; | |
2809 SRC(0,2)=SRC(1,0)= (t1 + t2 + 1) >> 1; | |
2810 SRC(0,3)=SRC(1,1)= (t1 + 2*t2 + t3 + 2) >> 2; | |
2811 SRC(0,4)=SRC(1,2)=SRC(2,0)= (t2 + t3 + 1) >> 1; | |
2812 SRC(0,5)=SRC(1,3)=SRC(2,1)= (t2 + 2*t3 + t4 + 2) >> 2; | |
2813 SRC(0,6)=SRC(1,4)=SRC(2,2)=SRC(3,0)= (t3 + t4 + 1) >> 1; | |
2814 SRC(0,7)=SRC(1,5)=SRC(2,3)=SRC(3,1)= (t3 + 2*t4 + t5 + 2) >> 2; | |
2815 SRC(1,6)=SRC(2,4)=SRC(3,2)=SRC(4,0)= (t4 + t5 + 1) >> 1; | |
2816 SRC(1,7)=SRC(2,5)=SRC(3,3)=SRC(4,1)= (t4 + 2*t5 + t6 + 2) >> 2; | |
2817 SRC(2,6)=SRC(3,4)=SRC(4,2)=SRC(5,0)= (t5 + t6 + 1) >> 1; | |
2818 SRC(2,7)=SRC(3,5)=SRC(4,3)=SRC(5,1)= (t5 + 2*t6 + t7 + 2) >> 2; | |
2819 SRC(3,6)=SRC(4,4)=SRC(5,2)=SRC(6,0)= (t6 + t7 + 1) >> 1; | |
2820 SRC(3,7)=SRC(4,5)=SRC(5,3)=SRC(6,1)= (t6 + 2*t7 + t8 + 2) >> 2; | |
2821 SRC(4,6)=SRC(5,4)=SRC(6,2)=SRC(7,0)= (t7 + t8 + 1) >> 1; | |
2822 SRC(4,7)=SRC(5,5)=SRC(6,3)=SRC(7,1)= (t7 + 2*t8 + t9 + 2) >> 2; | |
2823 SRC(5,6)=SRC(6,4)=SRC(7,2)= (t8 + t9 + 1) >> 1; | |
2824 SRC(5,7)=SRC(6,5)=SRC(7,3)= (t8 + 2*t9 + t10 + 2) >> 2; | |
2825 SRC(6,6)=SRC(7,4)= (t9 + t10 + 1) >> 1; | |
2826 SRC(6,7)=SRC(7,5)= (t9 + 2*t10 + t11 + 2) >> 2; | |
2827 SRC(7,6)= (t10 + t11 + 1) >> 1; | |
2828 SRC(7,7)= (t10 + 2*t11 + t12 + 2) >> 2; | |
2829 } | |
2830 static void pred8x8l_horizontal_up_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
2831 { | |
2832 PREDICT_8x8_LOAD_LEFT; | |
2833 SRC(0,0)= (l0 + l1 + 1) >> 1; | |
2834 SRC(1,0)= (l0 + 2*l1 + l2 + 2) >> 2; | |
2835 SRC(0,1)=SRC(2,0)= (l1 + l2 + 1) >> 1; | |
2836 SRC(1,1)=SRC(3,0)= (l1 + 2*l2 + l3 + 2) >> 2; | |
2837 SRC(0,2)=SRC(2,1)=SRC(4,0)= (l2 + l3 + 1) >> 1; | |
2838 SRC(1,2)=SRC(3,1)=SRC(5,0)= (l2 + 2*l3 + l4 + 2) >> 2; | |
2839 SRC(0,3)=SRC(2,2)=SRC(4,1)=SRC(6,0)= (l3 + l4 + 1) >> 1; | |
2840 SRC(1,3)=SRC(3,2)=SRC(5,1)=SRC(7,0)= (l3 + 2*l4 + l5 + 2) >> 2; | |
2841 SRC(0,4)=SRC(2,3)=SRC(4,2)=SRC(6,1)= (l4 + l5 + 1) >> 1; | |
2842 SRC(1,4)=SRC(3,3)=SRC(5,2)=SRC(7,1)= (l4 + 2*l5 + l6 + 2) >> 2; | |
2843 SRC(0,5)=SRC(2,4)=SRC(4,3)=SRC(6,2)= (l5 + l6 + 1) >> 1; | |
2844 SRC(1,5)=SRC(3,4)=SRC(5,3)=SRC(7,2)= (l5 + 2*l6 + l7 + 2) >> 2; | |
2845 SRC(0,6)=SRC(2,5)=SRC(4,4)=SRC(6,3)= (l6 + l7 + 1) >> 1; | |
2846 SRC(1,6)=SRC(3,5)=SRC(5,4)=SRC(7,3)= (l6 + 3*l7 + 2) >> 2; | |
2847 SRC(0,7)=SRC(1,7)=SRC(2,6)=SRC(2,7)=SRC(3,6)= | |
2848 SRC(3,7)=SRC(4,5)=SRC(4,6)=SRC(4,7)=SRC(5,5)= | |
2849 SRC(5,6)=SRC(5,7)=SRC(6,4)=SRC(6,5)=SRC(6,6)= | |
2850 SRC(6,7)=SRC(7,4)=SRC(7,5)=SRC(7,6)=SRC(7,7)= l7; | |
2851 } | |
2852 #undef PREDICT_8x8_LOAD_LEFT | |
2853 #undef PREDICT_8x8_LOAD_TOP | |
2854 #undef PREDICT_8x8_LOAD_TOPLEFT | |
2855 #undef PREDICT_8x8_LOAD_TOPRIGHT | |
2856 #undef PREDICT_8x8_DC | |
2857 #undef PTR | |
2858 #undef PT | |
2859 #undef PL | |
2860 #undef SRC | |
2861 | |
1168 | 2862 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list, |
2863 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
2864 int src_x_offset, int src_y_offset, | |
2865 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){ | |
2866 MpegEncContext * const s = &h->s; | |
2867 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8; | |
3316 | 2868 int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8; |
1168 | 2869 const int luma_xy= (mx&3) + ((my&3)<<2); |
3316 | 2870 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*h->mb_linesize; |
2871 uint8_t * src_cb, * src_cr; | |
2872 int extra_width= h->emu_edge_width; | |
2873 int extra_height= h->emu_edge_height; | |
1168 | 2874 int emu=0; |
2875 const int full_mx= mx>>2; | |
2876 const int full_my= my>>2; | |
2861
3b920e274b26
fix emulated edge motion compensation when resolution%16!=0
lorenm
parents:
2846
diff
changeset
|
2877 const int pic_width = 16*s->mb_width; |
3316 | 2878 const int pic_height = 16*s->mb_height >> MB_MBAFF; |
2967 | 2879 |
3125 | 2880 if(!pic->data[0]) |
2881 return; | |
2967 | 2882 |
1168 | 2883 if(mx&7) extra_width -= 3; |
2884 if(my&7) extra_height -= 3; | |
2967 | 2885 |
2886 if( full_mx < 0-extra_width | |
2887 || full_my < 0-extra_height | |
2888 || full_mx + 16/*FIXME*/ > pic_width + extra_width | |
2861
3b920e274b26
fix emulated edge motion compensation when resolution%16!=0
lorenm
parents:
2846
diff
changeset
|
2889 || full_my + 16/*FIXME*/ > pic_height + extra_height){ |
3316 | 2890 ff_emulated_edge_mc(s->edge_emu_buffer, src_y - 2 - 2*h->mb_linesize, h->mb_linesize, 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, pic_width, pic_height); |
2891 src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize; | |
1168 | 2892 emu=1; |
2893 } | |
2967 | 2894 |
3316 | 2895 qpix_op[luma_xy](dest_y, src_y, h->mb_linesize); //FIXME try variable height perhaps? |
1168 | 2896 if(!square){ |
3316 | 2897 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize); |
1168 | 2898 } |
2967 | 2899 |
1168 | 2900 if(s->flags&CODEC_FLAG_GRAY) return; |
2967 | 2901 |
3316 | 2902 if(MB_MBAFF){ |
2903 // chroma offset when predicting from a field of opposite parity | |
2904 my += 2 * ((s->mb_y & 1) - (h->ref_cache[list][scan8[n]] & 1)); | |
2905 emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1); | |
2906 } | |
2907 src_cb= pic->data[1] + (mx>>3) + (my>>3)*h->mb_uvlinesize; | |
2908 src_cr= pic->data[2] + (mx>>3) + (my>>3)*h->mb_uvlinesize; | |
1168 | 2909 |
2910 if(emu){ | |
3316 | 2911 ff_emulated_edge_mc(s->edge_emu_buffer, src_cb, h->mb_uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1); |
2912 src_cb= s->edge_emu_buffer; | |
2913 } | |
2914 chroma_op(dest_cb, src_cb, h->mb_uvlinesize, chroma_height, mx&7, my&7); | |
2915 | |
2916 if(emu){ | |
2917 ff_emulated_edge_mc(s->edge_emu_buffer, src_cr, h->mb_uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1); | |
1168 | 2918 src_cr= s->edge_emu_buffer; |
2919 } | |
3316 | 2920 chroma_op(dest_cr, src_cr, h->mb_uvlinesize, chroma_height, mx&7, my&7); |
1168 | 2921 } |
2922 | |
2415 | 2923 static inline void mc_part_std(H264Context *h, int n, int square, int chroma_height, int delta, |
1168 | 2924 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
2925 int x_offset, int y_offset, | |
2926 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
2927 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
2928 int list0, int list1){ | |
2929 MpegEncContext * const s = &h->s; | |
2930 qpel_mc_func *qpix_op= qpix_put; | |
2931 h264_chroma_mc_func chroma_op= chroma_put; | |
2967 | 2932 |
3316 | 2933 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize; |
2934 dest_cb += x_offset + y_offset*h->mb_uvlinesize; | |
2935 dest_cr += x_offset + y_offset*h->mb_uvlinesize; | |
1168 | 2936 x_offset += 8*s->mb_x; |
3316 | 2937 y_offset += 8*(s->mb_y >> MB_MBAFF); |
2967 | 2938 |
1168 | 2939 if(list0){ |
1169 | 2940 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ]; |
1168 | 2941 mc_dir_part(h, ref, n, square, chroma_height, delta, 0, |
2942 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2943 qpix_op, chroma_op); | |
2944 | |
2945 qpix_op= qpix_avg; | |
2946 chroma_op= chroma_avg; | |
2947 } | |
2948 | |
2949 if(list1){ | |
1169 | 2950 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ]; |
1168 | 2951 mc_dir_part(h, ref, n, square, chroma_height, delta, 1, |
2952 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
2953 qpix_op, chroma_op); | |
2954 } | |
2955 } | |
2956 | |
2415 | 2957 static inline void mc_part_weighted(H264Context *h, int n, int square, int chroma_height, int delta, |
2958 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
2959 int x_offset, int y_offset, | |
2960 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
2961 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op, | |
2962 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg, | |
2963 int list0, int list1){ | |
2964 MpegEncContext * const s = &h->s; | |
2965 | |
3316 | 2966 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize; |
2967 dest_cb += x_offset + y_offset*h->mb_uvlinesize; | |
2968 dest_cr += x_offset + y_offset*h->mb_uvlinesize; | |
2415 | 2969 x_offset += 8*s->mb_x; |
3316 | 2970 y_offset += 8*(s->mb_y >> MB_MBAFF); |
2967 | 2971 |
2415 | 2972 if(list0 && list1){ |
2973 /* don't optimize for luma-only case, since B-frames usually | |
2974 * use implicit weights => chroma too. */ | |
2975 uint8_t *tmp_cb = s->obmc_scratchpad; | |
3316 | 2976 uint8_t *tmp_cr = s->obmc_scratchpad + 8; |
2977 uint8_t *tmp_y = s->obmc_scratchpad + 8*h->mb_uvlinesize; | |
2415 | 2978 int refn0 = h->ref_cache[0][ scan8[n] ]; |
2979 int refn1 = h->ref_cache[1][ scan8[n] ]; | |
2980 | |
2981 mc_dir_part(h, &h->ref_list[0][refn0], n, square, chroma_height, delta, 0, | |
2982 dest_y, dest_cb, dest_cr, | |
2983 x_offset, y_offset, qpix_put, chroma_put); | |
2984 mc_dir_part(h, &h->ref_list[1][refn1], n, square, chroma_height, delta, 1, | |
2985 tmp_y, tmp_cb, tmp_cr, | |
2986 x_offset, y_offset, qpix_put, chroma_put); | |
2987 | |
2988 if(h->use_weight == 2){ | |
2989 int weight0 = h->implicit_weight[refn0][refn1]; | |
2990 int weight1 = 64 - weight0; | |
3316 | 2991 luma_weight_avg( dest_y, tmp_y, h-> mb_linesize, 5, weight0, weight1, 0); |
2992 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, 5, weight0, weight1, 0); | |
2993 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, 5, weight0, weight1, 0); | |
2415 | 2994 }else{ |
3316 | 2995 luma_weight_avg(dest_y, tmp_y, h->mb_linesize, h->luma_log2_weight_denom, |
2967 | 2996 h->luma_weight[0][refn0], h->luma_weight[1][refn1], |
3029 | 2997 h->luma_offset[0][refn0] + h->luma_offset[1][refn1]); |
3316 | 2998 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
2967 | 2999 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0], |
3029 | 3000 h->chroma_offset[0][refn0][0] + h->chroma_offset[1][refn1][0]); |
3316 | 3001 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
2967 | 3002 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1], |
3029 | 3003 h->chroma_offset[0][refn0][1] + h->chroma_offset[1][refn1][1]); |
2415 | 3004 } |
3005 }else{ | |
3006 int list = list1 ? 1 : 0; | |
3007 int refn = h->ref_cache[list][ scan8[n] ]; | |
3008 Picture *ref= &h->ref_list[list][refn]; | |
3009 mc_dir_part(h, ref, n, square, chroma_height, delta, list, | |
3010 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
3011 qpix_put, chroma_put); | |
3012 | |
3316 | 3013 luma_weight_op(dest_y, h->mb_linesize, h->luma_log2_weight_denom, |
2415 | 3014 h->luma_weight[list][refn], h->luma_offset[list][refn]); |
3015 if(h->use_weight_chroma){ | |
3316 | 3016 chroma_weight_op(dest_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
2415 | 3017 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]); |
3316 | 3018 chroma_weight_op(dest_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom, |
2415 | 3019 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]); |
3020 } | |
3021 } | |
3022 } | |
3023 | |
3024 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta, | |
3025 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
3026 int x_offset, int y_offset, | |
3027 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
3028 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
2967 | 3029 h264_weight_func *weight_op, h264_biweight_func *weight_avg, |
2415 | 3030 int list0, int list1){ |
3031 if((h->use_weight==2 && list0 && list1 | |
3032 && (h->implicit_weight[ h->ref_cache[0][scan8[n]] ][ h->ref_cache[1][scan8[n]] ] != 32)) | |
3033 || h->use_weight==1) | |
3034 mc_part_weighted(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
3035 x_offset, y_offset, qpix_put, chroma_put, | |
3036 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1); | |
3037 else | |
3038 mc_part_std(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
3039 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1); | |
3040 } | |
3041 | |
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3042 static inline void prefetch_motion(H264Context *h, int list){ |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3043 /* fetch pixels for estimated mv 4 macroblocks ahead |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3044 * optimized for 64byte cache lines */ |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3045 MpegEncContext * const s = &h->s; |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3046 const int refn = h->ref_cache[list][scan8[0]]; |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3047 if(refn >= 0){ |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3048 const int mx= (h->mv_cache[list][scan8[0]][0]>>2) + 16*s->mb_x + 8; |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3049 const int my= (h->mv_cache[list][scan8[0]][1]>>2) + 16*s->mb_y; |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3050 uint8_t **src= h->ref_list[list][refn].data; |
3316 | 3051 int off= mx + (my + (s->mb_x&3)*4)*h->mb_linesize + 64; |
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3052 s->dsp.prefetch(src[0]+off, s->linesize, 4); |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3053 off= (mx>>1) + ((my>>1) + (s->mb_x&7))*s->uvlinesize + 64; |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3054 s->dsp.prefetch(src[1]+off, src[2]-src[1], 2); |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3055 } |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3056 } |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3057 |
1168 | 3058 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
3059 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put), | |
2415 | 3060 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg), |
3061 h264_weight_func *weight_op, h264_biweight_func *weight_avg){ | |
1168 | 3062 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
|
3063 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 3064 const int mb_type= s->current_picture.mb_type[mb_xy]; |
2967 | 3065 |
1168 | 3066 assert(IS_INTER(mb_type)); |
2967 | 3067 |
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3068 prefetch_motion(h, 0); |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3069 |
1168 | 3070 if(IS_16X16(mb_type)){ |
3071 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0, | |
3072 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0], | |
2415 | 3073 &weight_op[0], &weight_avg[0], |
1168 | 3074 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
3075 }else if(IS_16X8(mb_type)){ | |
3076 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0, | |
3077 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
2415 | 3078 &weight_op[1], &weight_avg[1], |
1168 | 3079 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
3080 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4, | |
3081 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
2415 | 3082 &weight_op[1], &weight_avg[1], |
1168 | 3083 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
3084 }else if(IS_8X16(mb_type)){ | |
3316 | 3085 mc_part(h, 0, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 0, 0, |
1168 | 3086 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], |
2415 | 3087 &weight_op[2], &weight_avg[2], |
1168 | 3088 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
3316 | 3089 mc_part(h, 4, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 4, 0, |
1168 | 3090 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], |
2415 | 3091 &weight_op[2], &weight_avg[2], |
1168 | 3092 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
3093 }else{ | |
3094 int i; | |
2967 | 3095 |
1168 | 3096 assert(IS_8X8(mb_type)); |
3097 | |
3098 for(i=0; i<4; i++){ | |
3099 const int sub_mb_type= h->sub_mb_type[i]; | |
3100 const int n= 4*i; | |
3101 int x_offset= (i&1)<<2; | |
3102 int y_offset= (i&2)<<1; | |
3103 | |
3104 if(IS_SUB_8X8(sub_mb_type)){ | |
3105 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
3106 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
2415 | 3107 &weight_op[3], &weight_avg[3], |
1168 | 3108 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
3109 }else if(IS_SUB_8X4(sub_mb_type)){ | |
3110 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
3111 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
2415 | 3112 &weight_op[4], &weight_avg[4], |
1168 | 3113 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
3114 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2, | |
3115 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
2415 | 3116 &weight_op[4], &weight_avg[4], |
1168 | 3117 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
3118 }else if(IS_SUB_4X8(sub_mb_type)){ | |
3316 | 3119 mc_part(h, n , 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset, |
1168 | 3120 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], |
2415 | 3121 &weight_op[5], &weight_avg[5], |
1168 | 3122 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
3316 | 3123 mc_part(h, n+1, 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset, |
1168 | 3124 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], |
2415 | 3125 &weight_op[5], &weight_avg[5], |
1168 | 3126 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
3127 }else{ | |
3128 int j; | |
3129 assert(IS_SUB_4X4(sub_mb_type)); | |
3130 for(j=0; j<4; j++){ | |
3131 int sub_x_offset= x_offset + 2*(j&1); | |
3132 int sub_y_offset= y_offset + (j&2); | |
3133 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset, | |
3134 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
2415 | 3135 &weight_op[6], &weight_avg[6], |
1168 | 3136 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
3137 } | |
3138 } | |
3139 } | |
3140 } | |
3215
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3141 |
06f98047ff26
prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents:
3212
diff
changeset
|
3142 prefetch_motion(h, 1); |
1168 | 3143 } |
3144 | |
3145 static void decode_init_vlc(H264Context *h){ | |
3146 static int done = 0; | |
3147 | |
3148 if (!done) { | |
3149 int i; | |
3150 done = 1; | |
3151 | |
2967 | 3152 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5, |
1168 | 3153 &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
|
3154 &chroma_dc_coeff_token_bits[0], 1, 1, 1); |
1168 | 3155 |
3156 for(i=0; i<4; i++){ | |
2967 | 3157 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17, |
1168 | 3158 &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
|
3159 &coeff_token_bits[i][0], 1, 1, 1); |
1168 | 3160 } |
3161 | |
3162 for(i=0; i<3; i++){ | |
3163 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4, | |
3164 &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
|
3165 &chroma_dc_total_zeros_bits[i][0], 1, 1, 1); |
1168 | 3166 } |
3167 for(i=0; i<15; i++){ | |
2967 | 3168 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16, |
1168 | 3169 &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
|
3170 &total_zeros_bits[i][0], 1, 1, 1); |
1168 | 3171 } |
3172 | |
3173 for(i=0; i<6; i++){ | |
2967 | 3174 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7, |
1168 | 3175 &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
|
3176 &run_bits[i][0], 1, 1, 1); |
1168 | 3177 } |
2967 | 3178 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16, |
1168 | 3179 &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
|
3180 &run_bits[6][0], 1, 1, 1); |
1168 | 3181 } |
3182 } | |
3183 | |
3184 /** | |
3185 * Sets the intra prediction function pointers. | |
3186 */ | |
3187 static void init_pred_ptrs(H264Context *h){ | |
3188 // MpegEncContext * const s = &h->s; | |
3189 | |
3190 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; | |
3191 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; | |
3192 h->pred4x4[DC_PRED ]= pred4x4_dc_c; | |
3193 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c; | |
3194 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c; | |
3195 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c; | |
3196 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c; | |
3197 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c; | |
3198 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c; | |
3199 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c; | |
3200 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c; | |
3201 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; | |
3202 | |
2755 | 3203 h->pred8x8l[VERT_PRED ]= pred8x8l_vertical_c; |
3204 h->pred8x8l[HOR_PRED ]= pred8x8l_horizontal_c; | |
3205 h->pred8x8l[DC_PRED ]= pred8x8l_dc_c; | |
3206 h->pred8x8l[DIAG_DOWN_LEFT_PRED ]= pred8x8l_down_left_c; | |
3207 h->pred8x8l[DIAG_DOWN_RIGHT_PRED]= pred8x8l_down_right_c; | |
3208 h->pred8x8l[VERT_RIGHT_PRED ]= pred8x8l_vertical_right_c; | |
3209 h->pred8x8l[HOR_DOWN_PRED ]= pred8x8l_horizontal_down_c; | |
3210 h->pred8x8l[VERT_LEFT_PRED ]= pred8x8l_vertical_left_c; | |
3211 h->pred8x8l[HOR_UP_PRED ]= pred8x8l_horizontal_up_c; | |
3212 h->pred8x8l[LEFT_DC_PRED ]= pred8x8l_left_dc_c; | |
3213 h->pred8x8l[TOP_DC_PRED ]= pred8x8l_top_dc_c; | |
3214 h->pred8x8l[DC_128_PRED ]= pred8x8l_128_dc_c; | |
3215 | |
1168 | 3216 h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c; |
3217 h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c; | |
3218 h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c; | |
3219 h->pred8x8[PLANE_PRED8x8 ]= pred8x8_plane_c; | |
3220 h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c; | |
3221 h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c; | |
3222 h->pred8x8[DC_128_PRED8x8 ]= pred8x8_128_dc_c; | |
3223 | |
3224 h->pred16x16[DC_PRED8x8 ]= pred16x16_dc_c; | |
3225 h->pred16x16[VERT_PRED8x8 ]= pred16x16_vertical_c; | |
3226 h->pred16x16[HOR_PRED8x8 ]= pred16x16_horizontal_c; | |
3227 h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c; | |
3228 h->pred16x16[LEFT_DC_PRED8x8]= pred16x16_left_dc_c; | |
3229 h->pred16x16[TOP_DC_PRED8x8 ]= pred16x16_top_dc_c; | |
3230 h->pred16x16[DC_128_PRED8x8 ]= pred16x16_128_dc_c; | |
3231 } | |
3232 | |
3233 static void free_tables(H264Context *h){ | |
3234 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
|
3235 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
|
3236 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
|
3237 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
|
3238 av_freep(&h->mvd_table[1]); |
2396 | 3239 av_freep(&h->direct_table); |
1168 | 3240 av_freep(&h->non_zero_count); |
3241 av_freep(&h->slice_table_base); | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3242 av_freep(&h->top_borders[1]); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3243 av_freep(&h->top_borders[0]); |
1168 | 3244 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
|
3245 |
1168 | 3246 av_freep(&h->mb2b_xy); |
3247 av_freep(&h->mb2b8_xy); | |
2415 | 3248 |
3249 av_freep(&h->s.obmc_scratchpad); | |
1168 | 3250 } |
3251 | |
2919 | 3252 static void init_dequant8_coeff_table(H264Context *h){ |
3253 int i,q,x; | |
3174 | 3254 const int transpose = (h->s.dsp.h264_idct8_add != ff_h264_idct8_add_c); //FIXME ugly |
2919 | 3255 h->dequant8_coeff[0] = h->dequant8_buffer[0]; |
3256 h->dequant8_coeff[1] = h->dequant8_buffer[1]; | |
3257 | |
3258 for(i=0; i<2; i++ ){ | |
3259 if(i && !memcmp(h->pps.scaling_matrix8[0], h->pps.scaling_matrix8[1], 64*sizeof(uint8_t))){ | |
3260 h->dequant8_coeff[1] = h->dequant8_buffer[0]; | |
3261 break; | |
3262 } | |
3263 | |
3264 for(q=0; q<52; q++){ | |
3265 int shift = div6[q]; | |
3266 int idx = rem6[q]; | |
3267 for(x=0; x<64; x++) | |
3174 | 3268 h->dequant8_coeff[i][q][transpose ? (x>>3)|((x&7)<<3) : x] = |
3269 ((uint32_t)dequant8_coeff_init[idx][ dequant8_coeff_init_scan[((x>>1)&12) | (x&3)] ] * | |
3270 h->pps.scaling_matrix8[i][x]) << shift; | |
2919 | 3271 } |
3272 } | |
3273 } | |
3274 | |
3275 static void init_dequant4_coeff_table(H264Context *h){ | |
3276 int i,j,q,x; | |
3005 | 3277 const int transpose = (h->s.dsp.h264_idct_add != ff_h264_idct_add_c); //FIXME ugly |
2919 | 3278 for(i=0; i<6; i++ ){ |
3279 h->dequant4_coeff[i] = h->dequant4_buffer[i]; | |
3280 for(j=0; j<i; j++){ | |
3281 if(!memcmp(h->pps.scaling_matrix4[j], h->pps.scaling_matrix4[i], 16*sizeof(uint8_t))){ | |
3282 h->dequant4_coeff[i] = h->dequant4_buffer[j]; | |
3283 break; | |
3284 } | |
3285 } | |
3286 if(j<i) | |
3287 continue; | |
3288 | |
3289 for(q=0; q<52; q++){ | |
3290 int shift = div6[q] + 2; | |
3291 int idx = rem6[q]; | |
3292 for(x=0; x<16; x++) | |
3005 | 3293 h->dequant4_coeff[i][q][transpose ? (x>>2)|((x<<2)&0xF) : x] = |
3294 ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] * | |
2919 | 3295 h->pps.scaling_matrix4[i][x]) << shift; |
3296 } | |
3297 } | |
3298 } | |
3299 | |
3300 static void init_dequant_tables(H264Context *h){ | |
3301 int i,x; | |
3302 init_dequant4_coeff_table(h); | |
3303 if(h->pps.transform_8x8_mode) | |
3304 init_dequant8_coeff_table(h); | |
3305 if(h->sps.transform_bypass){ | |
3306 for(i=0; i<6; i++) | |
3307 for(x=0; x<16; x++) | |
3308 h->dequant4_coeff[i][0][x] = 1<<6; | |
3309 if(h->pps.transform_8x8_mode) | |
3310 for(i=0; i<2; i++) | |
3311 for(x=0; x<64; x++) | |
3312 h->dequant8_coeff[i][0][x] = 1<<6; | |
3313 } | |
3314 } | |
3315 | |
3316 | |
1168 | 3317 /** |
3318 * allocates tables. | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3319 * needs width/height |
1168 | 3320 */ |
3321 static int alloc_tables(H264Context *h){ | |
3322 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
|
3323 const int big_mb_num= s->mb_stride * (s->mb_height+1); |
2919 | 3324 int x,y; |
1168 | 3325 |
3326 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
|
3327 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3328 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t)) |
3316 | 3329 CHECKED_ALLOCZ(h->slice_table_base , (big_mb_num+s->mb_stride) * sizeof(uint8_t)) |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3330 CHECKED_ALLOCZ(h->top_borders[0] , s->mb_width * (16+8+8) * sizeof(uint8_t)) |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3331 CHECKED_ALLOCZ(h->top_borders[1] , s->mb_width * (16+8+8) * sizeof(uint8_t)) |
2336 | 3332 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t)) |
1168 | 3333 |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3334 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
|
3335 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
|
3336 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
|
3337 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t)); |
2396 | 3338 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
|
3339 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3340 |
3316 | 3341 memset(h->slice_table_base, -1, (big_mb_num+s->mb_stride) * sizeof(uint8_t)); |
3342 h->slice_table= h->slice_table_base + s->mb_stride*2 + 1; | |
1168 | 3343 |
2641
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
3344 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint32_t)); |
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
3345 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint32_t)); |
1168 | 3346 for(y=0; y<s->mb_height; y++){ |
3347 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
|
3348 const int mb_xy= x + y*s->mb_stride; |
1168 | 3349 const int b_xy = 4*x + 4*y*h->b_stride; |
3350 const int b8_xy= 2*x + 2*y*h->b8_stride; | |
2967 | 3351 |
1168 | 3352 h->mb2b_xy [mb_xy]= b_xy; |
3353 h->mb2b8_xy[mb_xy]= b8_xy; | |
3354 } | |
3355 } | |
2415 | 3356 |
2417 | 3357 s->obmc_scratchpad = NULL; |
3358 | |
2920 | 3359 if(!h->dequant4_coeff[0]) |
3360 init_dequant_tables(h); | |
3361 | |
1168 | 3362 return 0; |
3363 fail: | |
3364 free_tables(h); | |
3365 return -1; | |
3366 } | |
3367 | |
3368 static void common_init(H264Context *h){ | |
3369 MpegEncContext * const s = &h->s; | |
3370 | |
3371 s->width = s->avctx->width; | |
3372 s->height = s->avctx->height; | |
3373 s->codec_id= s->avctx->codec->id; | |
2967 | 3374 |
1168 | 3375 init_pred_ptrs(h); |
3376 | |
2919 | 3377 h->dequant_coeff_pps= -1; |
1698 | 3378 s->unrestricted_mv=1; |
1168 | 3379 s->decode=1; //FIXME |
2920 | 3380 |
3381 memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t)); | |
3382 memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t)); | |
1168 | 3383 } |
3384 | |
3385 static int decode_init(AVCodecContext *avctx){ | |
3386 H264Context *h= avctx->priv_data; | |
3387 MpegEncContext * const s = &h->s; | |
3388 | |
1892 | 3389 MPV_decode_defaults(s); |
2967 | 3390 |
1168 | 3391 s->avctx = avctx; |
3392 common_init(h); | |
3393 | |
3394 s->out_format = FMT_H264; | |
3395 s->workaround_bugs= avctx->workaround_bugs; | |
3396 | |
3397 // set defaults | |
3398 // s->decode_mb= ff_h263_decode_mb; | |
3399 s->low_delay= 1; | |
3400 avctx->pix_fmt= PIX_FMT_YUV420P; | |
3401 | |
3402 decode_init_vlc(h); | |
2967 | 3403 |
2547
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
3404 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
|
3405 *(char *)avctx->extradata == 1){ |
2227 | 3406 h->is_avc = 1; |
3407 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
|
3408 } else { |
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
3409 h->is_avc = 0; |
2227 | 3410 } |
3411 | |
1168 | 3412 return 0; |
3413 } | |
3414 | |
2935 | 3415 static int frame_start(H264Context *h){ |
1168 | 3416 MpegEncContext * const s = &h->s; |
3417 int i; | |
3418 | |
2935 | 3419 if(MPV_frame_start(s, s->avctx) < 0) |
3420 return -1; | |
1168 | 3421 ff_er_frame_start(s); |
3422 | |
3423 assert(s->linesize && s->uvlinesize); | |
3424 | |
3425 for(i=0; i<16; i++){ | |
3426 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
|
3427 h->block_offset[24+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->linesize*((scan8[i] - scan8[0])>>3); |
1168 | 3428 } |
3429 for(i=0; i<4; i++){ | |
3430 h->block_offset[16+i]= | |
3431 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
|
3432 h->block_offset[24+16+i]= |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3433 h->block_offset[24+20+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->uvlinesize*((scan8[i] - scan8[0])>>3); |
1168 | 3434 } |
3435 | |
2416
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
3436 /* 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
|
3437 * 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
|
3438 if(!s->obmc_scratchpad) |
3316 | 3439 s->obmc_scratchpad = av_malloc(16*2*s->linesize + 8*2*s->uvlinesize); |
3440 | |
3441 /* some macroblocks will be accessed before they're available */ | |
3442 if(FRAME_MBAFF) | |
3443 memset(h->slice_table, -1, (s->mb_height*s->mb_stride-1) * sizeof(uint8_t)); | |
2416
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
3444 |
1168 | 3445 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; |
2935 | 3446 return 0; |
1168 | 3447 } |
3448 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3449 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
|
3450 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
|
3451 int i; |
2967 | 3452 |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3453 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
|
3454 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
|
3455 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
|
3456 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3457 // There are two lines saved, the line above the the top macroblock of a pair, |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3458 // and the line above the bottom macroblock |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3459 h->left_border[0]= h->top_borders[0][s->mb_x][15]; |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3460 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
|
3461 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
|
3462 } |
2967 | 3463 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3464 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 16*linesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3465 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize); |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3466 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3467 if(!(s->flags&CODEC_FLAG_GRAY)){ |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3468 h->left_border[17 ]= h->top_borders[0][s->mb_x][16+7]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3469 h->left_border[17+9]= h->top_borders[0][s->mb_x][24+7]; |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3470 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
|
3471 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
|
3472 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
|
3473 } |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3474 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+8*uvlinesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3475 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+8*uvlinesize); |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3476 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3477 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3478 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3479 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
|
3480 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
|
3481 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
|
3482 uint64_t temp64; |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3483 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
|
3484 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
|
3485 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3486 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
|
3487 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
|
3488 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
|
3489 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3490 #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
|
3491 t= a;\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3492 if(xchg)\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3493 a= b;\ |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3494 b= t; |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3495 |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3496 if(deblock_left){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3497 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
|
3498 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
|
3499 } |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3500 } |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3501 |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3502 if(deblock_top){ |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3503 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3504 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); |
2803 | 3505 if(s->mb_x+1 < s->mb_width){ |
2755 | 3506 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1); |
3507 } | |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3508 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3509 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3510 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
|
3511 if(deblock_left){ |
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3512 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
|
3513 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
|
3514 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
|
3515 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3516 } |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3517 if(deblock_top){ |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3518 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3519 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3520 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3521 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3522 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3523 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3524 static inline void backup_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3525 MpegEncContext * const s = &h->s; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3526 int i; |
2967 | 3527 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3528 src_y -= 2 * linesize; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3529 src_cb -= 2 * uvlinesize; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3530 src_cr -= 2 * uvlinesize; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3531 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3532 // There are two lines saved, the line above the the top macroblock of a pair, |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3533 // and the line above the bottom macroblock |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3534 h->left_border[0]= h->top_borders[0][s->mb_x][15]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3535 h->left_border[1]= h->top_borders[1][s->mb_x][15]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3536 for(i=2; i<34; i++){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3537 h->left_border[i]= src_y[15+i* linesize]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3538 } |
2967 | 3539 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3540 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 32*linesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3541 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+32*linesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3542 *(uint64_t*)(h->top_borders[1][s->mb_x]+0)= *(uint64_t*)(src_y + 33*linesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3543 *(uint64_t*)(h->top_borders[1][s->mb_x]+8)= *(uint64_t*)(src_y +8+33*linesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3544 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3545 if(!(s->flags&CODEC_FLAG_GRAY)){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3546 h->left_border[34 ]= h->top_borders[0][s->mb_x][16+7]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3547 h->left_border[34+ 1]= h->top_borders[1][s->mb_x][16+7]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3548 h->left_border[34+18 ]= h->top_borders[0][s->mb_x][24+7]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3549 h->left_border[34+18+1]= h->top_borders[1][s->mb_x][24+7]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3550 for(i=2; i<18; i++){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3551 h->left_border[i+34 ]= src_cb[7+i*uvlinesize]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3552 h->left_border[i+34+18]= src_cr[7+i*uvlinesize]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3553 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3554 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+16*uvlinesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3555 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+16*uvlinesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3556 *(uint64_t*)(h->top_borders[1][s->mb_x]+16)= *(uint64_t*)(src_cb+17*uvlinesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3557 *(uint64_t*)(h->top_borders[1][s->mb_x]+24)= *(uint64_t*)(src_cr+17*uvlinesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3558 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3559 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3560 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3561 static inline void xchg_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3562 MpegEncContext * const s = &h->s; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3563 int temp8, i; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3564 uint64_t temp64; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3565 int deblock_left = (s->mb_x > 0); |
3316 | 3566 int deblock_top = (s->mb_y > 1); |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3567 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3568 tprintf("xchg_pair_border: src_y:%p src_cb:%p src_cr:%p ls:%d uvls:%d\n", src_y, src_cb, src_cr, linesize, uvlinesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3569 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3570 src_y -= 2 * linesize + 1; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3571 src_cb -= 2 * uvlinesize + 1; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3572 src_cr -= 2 * uvlinesize + 1; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3573 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3574 #define XCHG(a,b,t,xchg)\ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3575 t= a;\ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3576 if(xchg)\ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3577 a= b;\ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3578 b= t; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3579 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3580 if(deblock_left){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3581 for(i = (!deblock_top)<<1; i<34; i++){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3582 XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3583 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3584 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3585 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3586 if(deblock_top){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3587 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3588 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3589 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+0), *(uint64_t*)(src_y +1 +linesize), temp64, xchg); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3590 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+8), *(uint64_t*)(src_y +9 +linesize), temp64, 1); |
3316 | 3591 if(s->mb_x+1 < s->mb_width){ |
3592 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1); | |
3593 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x+1]), *(uint64_t*)(src_y +17 +linesize), temp64, 1); | |
3594 } | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3595 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3596 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3597 if(!(s->flags&CODEC_FLAG_GRAY)){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3598 if(deblock_left){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3599 for(i = (!deblock_top) << 1; i<18; i++){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3600 XCHG(h->left_border[i+34 ], src_cb[i*uvlinesize], temp8, xchg); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3601 XCHG(h->left_border[i+34+18], src_cr[i*uvlinesize], temp8, xchg); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3602 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3603 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3604 if(deblock_top){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3605 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3606 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3607 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+16), *(uint64_t*)(src_cb+1 +uvlinesize), temp64, 1); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3608 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+24), *(uint64_t*)(src_cr+1 +uvlinesize), temp64, 1); |
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3609 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3610 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3611 } |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3612 |
1168 | 3613 static void hl_decode_mb(H264Context *h){ |
3614 MpegEncContext * const s = &h->s; | |
3615 const int mb_x= s->mb_x; | |
3616 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
|
3617 const int mb_xy= mb_x + mb_y*s->mb_stride; |
1168 | 3618 const int mb_type= s->current_picture.mb_type[mb_xy]; |
3619 uint8_t *dest_y, *dest_cb, *dest_cr; | |
3620 int linesize, uvlinesize /*dct_offset*/; | |
3621 int i; | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3622 int *block_offset = &h->block_offset[0]; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3623 const unsigned int bottom = mb_y & 1; |
2763 | 3624 const int transform_bypass = (s->qscale == 0 && h->sps.transform_bypass); |
3625 void (*idct_add)(uint8_t *dst, DCTELEM *block, int stride); | |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3626 void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride); |
1168 | 3627 |
3628 if(!s->decode) | |
3629 return; | |
3630 | |
3631 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; | |
3632 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
3633 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
3634 | |
3316 | 3635 if (MB_FIELD) { |
3636 linesize = h->mb_linesize = s->linesize * 2; | |
3637 uvlinesize = h->mb_uvlinesize = s->uvlinesize * 2; | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3638 block_offset = &h->block_offset[24]; |
1168 | 3639 if(mb_y&1){ //FIXME move out of this func? |
3640 dest_y -= s->linesize*15; | |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3641 dest_cb-= s->uvlinesize*7; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3642 dest_cr-= s->uvlinesize*7; |
1168 | 3643 } |
3316 | 3644 if(FRAME_MBAFF) { |
3645 int list; | |
3646 for(list=0; list<2; list++){ | |
3647 if(!USES_LIST(mb_type, list)) | |
3648 continue; | |
3649 if(IS_16X16(mb_type)){ | |
3650 int8_t *ref = &h->ref_cache[list][scan8[0]]; | |
3651 fill_rectangle(ref, 4, 4, 8, 16+*ref^(s->mb_y&1), 1); | |
3652 }else{ | |
3653 for(i=0; i<16; i+=4){ | |
3654 //FIXME can refs be smaller than 8x8 when !direct_8x8_inference ? | |
3655 int ref = h->ref_cache[list][scan8[i]]; | |
3656 if(ref >= 0) | |
3657 fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2, 8, 16+ref^(s->mb_y&1), 1); | |
3658 } | |
3659 } | |
3660 } | |
3661 } | |
1168 | 3662 } else { |
3316 | 3663 linesize = h->mb_linesize = s->linesize; |
3664 uvlinesize = h->mb_uvlinesize = s->uvlinesize; | |
1168 | 3665 // dct_offset = s->linesize * 16; |
3666 } | |
2967 | 3667 |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3668 if(transform_bypass){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3669 idct_dc_add = |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3670 idct_add = IS_8x8DCT(mb_type) ? s->dsp.add_pixels8 : s->dsp.add_pixels4; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3671 }else if(IS_8x8DCT(mb_type)){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3672 idct_dc_add = s->dsp.h264_idct8_dc_add; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3673 idct_add = s->dsp.h264_idct8_add; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3674 }else{ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3675 idct_dc_add = s->dsp.h264_idct_dc_add; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3676 idct_add = s->dsp.h264_idct_add; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3677 } |
1168 | 3678 |
3316 | 3679 if(FRAME_MBAFF && h->deblocking_filter && IS_INTRA(mb_type) |
3680 && (!bottom || !IS_INTRA(s->current_picture.mb_type[mb_xy-s->mb_stride]))){ | |
3681 int mbt_y = mb_y&~1; | |
3682 uint8_t *top_y = s->current_picture.data[0] + (mbt_y * 16* s->linesize ) + mb_x * 16; | |
3683 uint8_t *top_cb = s->current_picture.data[1] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8; | |
3684 uint8_t *top_cr = s->current_picture.data[2] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8; | |
3685 xchg_pair_border(h, top_y, top_cb, top_cr, s->linesize, s->uvlinesize, 1); | |
3686 } | |
3687 | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3688 if (IS_INTRA_PCM(mb_type)) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3689 unsigned int x, y; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3690 |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3691 // 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
|
3692 // 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
|
3693 for(i=0; i<16; i++) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3694 for (y=0; y<4; y++) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3695 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
|
3696 *(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
|
3697 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3698 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3699 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3700 for(i=16; i<16+4; i++) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3701 for (y=0; y<4; y++) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3702 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
|
3703 *(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
|
3704 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3705 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3706 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3707 for(i=20; i<20+4; i++) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3708 for (y=0; y<4; y++) { |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3709 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
|
3710 *(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
|
3711 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3712 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3713 } |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3714 } else { |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3715 if(IS_INTRA(mb_type)){ |
3316 | 3716 if(h->deblocking_filter && !FRAME_MBAFF) |
3717 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1); | |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3718 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3719 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
|
3720 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
|
3721 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
|
3722 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3723 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3724 if(IS_INTRA4x4(mb_type)){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3725 if(!s->encoding){ |
2755 | 3726 if(IS_8x8DCT(mb_type)){ |
3727 for(i=0; i<16; i+=4){ | |
3728 uint8_t * const ptr= dest_y + block_offset[i]; | |
3729 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ]; | |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3730 const int nnz = h->non_zero_count_cache[ scan8[i] ]; |
2755 | 3731 h->pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000, |
3732 (h->topright_samples_available<<(i+1))&0x8000, linesize); | |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3733 if(nnz){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3734 if(nnz == 1 && h->mb[i*16]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3735 idct_dc_add(ptr, h->mb + i*16, linesize); |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3736 else |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3737 idct_add(ptr, h->mb + i*16, linesize); |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3738 } |
2755 | 3739 } |
3740 }else | |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3741 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
|
3742 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
|
3743 uint8_t *topright; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3744 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ]; |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3745 int nnz, tr; |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3746 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3747 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
|
3748 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
|
3749 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
|
3750 if(!topright_avail){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3751 tr= ptr[3 - linesize]*0x01010101; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3752 topright= (uint8_t*) &tr; |
2967 | 3753 }else |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3754 topright= ptr + 4 - linesize; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3755 }else |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3756 topright= NULL; |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3757 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3758 h->pred4x4[ dir ](ptr, topright, linesize); |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3759 nnz = h->non_zero_count_cache[ scan8[i] ]; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3760 if(nnz){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3761 if(s->codec_id == CODEC_ID_H264){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3762 if(nnz == 1 && h->mb[i*16]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3763 idct_dc_add(ptr, h->mb + i*16, linesize); |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3764 else |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3765 idct_add(ptr, h->mb + i*16, linesize); |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3766 }else |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3767 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
|
3768 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3769 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3770 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3771 }else{ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3772 h->pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize); |
2763 | 3773 if(s->codec_id == CODEC_ID_H264){ |
3774 if(!transform_bypass) | |
2919 | 3775 h264_luma_dc_dequant_idct_c(h->mb, s->qscale, h->dequant4_coeff[IS_INTRA(mb_type) ? 0:3][s->qscale][0]); |
2763 | 3776 }else |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3777 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
|
3778 } |
3316 | 3779 if(h->deblocking_filter && !FRAME_MBAFF) |
3780 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0); | |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3781 }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
|
3782 hl_motion(h, dest_y, dest_cb, dest_cr, |
2967 | 3783 s->dsp.put_h264_qpel_pixels_tab, s->dsp.put_h264_chroma_pixels_tab, |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3784 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
|
3785 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
|
3786 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3787 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3788 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3789 if(!IS_INTRA4x4(mb_type)){ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3790 if(s->codec_id == CODEC_ID_H264){ |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3791 if(IS_INTRA16x16(mb_type)){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3792 for(i=0; i<16; i++){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3793 if(h->non_zero_count_cache[ scan8[i] ]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3794 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize); |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3795 else if(h->mb[i*16]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3796 idct_dc_add(dest_y + block_offset[i], h->mb + i*16, linesize); |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3797 } |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3798 }else{ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3799 const int di = IS_8x8DCT(mb_type) ? 4 : 1; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3800 for(i=0; i<16; i+=di){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3801 int nnz = h->non_zero_count_cache[ scan8[i] ]; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3802 if(nnz){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3803 if(nnz==1 && h->mb[i*16]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3804 idct_dc_add(dest_y + block_offset[i], h->mb + i*16, linesize); |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3805 else |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3806 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize); |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3807 } |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3808 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3809 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3810 }else{ |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3811 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
|
3812 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
|
3813 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
|
3814 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); |
1234 | 3815 } |
1168 | 3816 } |
3817 } | |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3818 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3819 |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3820 if(!(s->flags&CODEC_FLAG_GRAY)){ |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3821 uint8_t *dest[2] = {dest_cb, dest_cr}; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3822 if(transform_bypass){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3823 idct_add = idct_dc_add = s->dsp.add_pixels4; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3824 }else{ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3825 idct_add = s->dsp.h264_idct_add; |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3826 idct_dc_add = s->dsp.h264_idct_dc_add; |
2919 | 3827 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp, h->dequant4_coeff[IS_INTRA(mb_type) ? 1:4][h->chroma_qp][0]); |
3828 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp, h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp][0]); | |
2763 | 3829 } |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3830 if(s->codec_id == CODEC_ID_H264){ |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3831 for(i=16; i<16+8; i++){ |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3832 if(h->non_zero_count_cache[ scan8[i] ]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3833 idct_add(dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize); |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3834 else if(h->mb[i*16]) |
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3835 idct_dc_add(dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize); |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3836 } |
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3837 }else{ |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3838 for(i=16; i<16+8; i++){ |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3839 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
3840 uint8_t * const ptr= dest[(i&4)>>2] + block_offset[i]; |
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3841 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
|
3842 } |
1250 | 3843 } |
1168 | 3844 } |
3845 } | |
3846 } | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3847 if(h->deblocking_filter) { |
3316 | 3848 if (FRAME_MBAFF) { |
3849 //FIXME try deblocking one mb at a time? | |
3850 // the reduction in load/storing mvs and such might outweigh the extra backup/xchg_border | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3851 const int mb_y = s->mb_y - 1; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3852 uint8_t *pair_dest_y, *pair_dest_cb, *pair_dest_cr; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3853 const int mb_xy= mb_x + mb_y*s->mb_stride; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3854 const int mb_type_top = s->current_picture.mb_type[mb_xy]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3855 const int mb_type_bottom= s->current_picture.mb_type[mb_xy+s->mb_stride]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3856 if (!bottom) return; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3857 pair_dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3858 pair_dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3859 pair_dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3860 |
3316 | 3861 if(IS_INTRA(mb_type_top | mb_type_bottom)) |
3862 xchg_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize, 0); | |
3863 | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3864 backup_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize); |
3316 | 3865 // deblock a pair |
2967 | 3866 // top |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3867 s->mb_y--; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3868 tprintf("call mbaff filter_mb mb_x:%d mb_y:%d pair_dest_y = %p, dest_y = %p\n", mb_x, mb_y, pair_dest_y, dest_y); |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3869 fill_caches(h, mb_type_top, 1); //FIXME don't fill stuff which isn't used by filter_mb |
3316 | 3870 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mb_xy]); |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3871 filter_mb(h, mb_x, mb_y, pair_dest_y, pair_dest_cb, pair_dest_cr, linesize, uvlinesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3872 // bottom |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3873 s->mb_y++; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3874 tprintf("call mbaff filter_mb\n"); |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3875 fill_caches(h, mb_type_bottom, 1); //FIXME don't fill stuff which isn't used by filter_mb |
3316 | 3876 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mb_xy+s->mb_stride]); |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3877 filter_mb(h, mb_x, mb_y+1, dest_y, dest_cb, dest_cr, linesize, uvlinesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3878 } else { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3879 tprintf("call filter_mb\n"); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3880 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize); |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3881 fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3882 filter_mb(h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3883 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3884 } |
1168 | 3885 } |
3886 | |
3887 /** | |
3888 * fills the default_ref_list. | |
3889 */ | |
3890 static int fill_default_ref_list(H264Context *h){ | |
3891 MpegEncContext * const s = &h->s; | |
3892 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
|
3893 int smallest_poc_greater_than_current = -1; |
2582 | 3894 Picture sorted_short_ref[32]; |
2967 | 3895 |
1168 | 3896 if(h->slice_type==B_TYPE){ |
3897 int out_i; | |
2713 | 3898 int limit= INT_MIN; |
1168 | 3899 |
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
|
3900 /* sort frame according to poc in B slice */ |
1168 | 3901 for(out_i=0; out_i<h->short_ref_count; out_i++){ |
2713 | 3902 int best_i=INT_MIN; |
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
|
3903 int best_poc=INT_MAX; |
1168 | 3904 |
3905 for(i=0; i<h->short_ref_count; i++){ | |
3906 const int poc= h->short_ref[i]->poc; | |
3907 if(poc > limit && poc < best_poc){ | |
3908 best_poc= poc; | |
3909 best_i= i; | |
3910 } | |
3911 } | |
2967 | 3912 |
2713 | 3913 assert(best_i != INT_MIN); |
2967 | 3914 |
1168 | 3915 limit= best_poc; |
3916 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
|
3917 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
|
3918 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
|
3919 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
|
3920 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
|
3921 } |
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
|
3922 } |
1168 | 3923 } |
3924 } | |
3925 | |
3926 if(s->picture_structure == PICT_FRAME){ | |
3927 if(h->slice_type==B_TYPE){ | |
3928 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
|
3929 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
|
3930 |
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
|
3931 // find the largest poc |
1168 | 3932 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
|
3933 int index = 0; |
2447 | 3934 int j= -99; |
3935 int step= list ? -1 : 1; | |
3936 | |
3937 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++, j+=step) { | |
3938 while(j<0 || j>= h->short_ref_count){ | |
2680
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3939 if(j != -99 && step == (list ? -1 : 1)) |
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3940 return -1; |
2447 | 3941 step = -step; |
3942 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
|
3943 } |
2447 | 3944 if(sorted_short_ref[j].reference != 3) continue; |
3945 h->default_ref_list[list][index ]= sorted_short_ref[j]; | |
3946 h->default_ref_list[list][index++].pic_id= sorted_short_ref[j].frame_num; | |
1168 | 3947 } |
3948 | |
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
|
3949 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
|
3950 if(h->long_ref[i] == NULL) continue; |
1168 | 3951 if(h->long_ref[i]->reference != 3) continue; |
3952 | |
3953 h->default_ref_list[ list ][index ]= *h->long_ref[i]; | |
3954 h->default_ref_list[ list ][index++].pic_id= i;; | |
3955 } | |
2967 | 3956 |
2447 | 3957 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
|
3958 // 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
|
3959 // L0 and L1 are identical |
1168 | 3960 Picture temp= h->default_ref_list[1][0]; |
3961 h->default_ref_list[1][0] = h->default_ref_list[1][1]; | |
2673 | 3962 h->default_ref_list[1][1] = temp; |
1168 | 3963 } |
3964 | |
3965 if(index < h->ref_count[ list ]) | |
3966 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index)); | |
3967 } | |
3968 }else{ | |
3969 int index=0; | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3970 for(i=0; i<h->short_ref_count; i++){ |
1168 | 3971 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit |
3972 h->default_ref_list[0][index ]= *h->short_ref[i]; | |
3973 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num; | |
3974 } | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3975 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
|
3976 if(h->long_ref[i] == NULL) continue; |
1168 | 3977 if(h->long_ref[i]->reference != 3) continue; |
3978 h->default_ref_list[0][index ]= *h->long_ref[i]; | |
3979 h->default_ref_list[0][index++].pic_id= i;; | |
3980 } | |
3981 if(index < h->ref_count[0]) | |
3982 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index)); | |
3983 } | |
3984 }else{ //FIELD | |
3985 if(h->slice_type==B_TYPE){ | |
3986 }else{ | |
3987 //FIXME second field balh | |
3988 } | |
3989 } | |
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
|
3990 #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
|
3991 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
|
3992 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
|
3993 } |
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
|
3994 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
|
3995 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
|
3996 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
|
3997 } |
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
|
3998 } |
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
|
3999 #endif |
1168 | 4000 return 0; |
4001 } | |
4002 | |
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
|
4003 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
|
4004 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
|
4005 |
1168 | 4006 static int decode_ref_pic_list_reordering(H264Context *h){ |
4007 MpegEncContext * const s = &h->s; | |
2680
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
4008 int list, index; |
2967 | 4009 |
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
|
4010 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
|
4011 print_long_term(h); |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4012 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move before func |
2967 | 4013 |
1168 | 4014 for(list=0; list<2; list++){ |
4015 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]); | |
4016 | |
4017 if(get_bits1(&s->gb)){ | |
4018 int pred= h->curr_pic_num; | |
4019 | |
4020 for(index=0; ; index++){ | |
4021 int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb); | |
4022 int pic_id; | |
4023 int i; | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
4024 Picture *ref = NULL; |
2967 | 4025 |
4026 if(reordering_of_pic_nums_idc==3) | |
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
4027 break; |
2967 | 4028 |
1168 | 4029 if(index >= h->ref_count[list]){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4030 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n"); |
1168 | 4031 return -1; |
4032 } | |
2967 | 4033 |
1168 | 4034 if(reordering_of_pic_nums_idc<3){ |
4035 if(reordering_of_pic_nums_idc<2){ | |
4036 const int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1; | |
4037 | |
4038 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
|
4039 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n"); |
1168 | 4040 return -1; |
4041 } | |
4042 | |
4043 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num; | |
4044 else pred+= abs_diff_pic_num; | |
4045 pred &= h->max_pic_num - 1; | |
2967 | 4046 |
2683 | 4047 for(i= h->short_ref_count-1; i>=0; i--){ |
4048 ref = h->short_ref[i]; | |
4049 assert(ref->reference == 3); | |
4050 assert(!ref->long_ref); | |
4051 if(ref->data[0] != NULL && ref->frame_num == pred && ref->long_ref == 0) // ignore non existing pictures by testing data[0] pointer | |
1168 | 4052 break; |
4053 } | |
2683 | 4054 if(i>=0) |
4055 ref->pic_id= ref->frame_num; | |
1168 | 4056 }else{ |
4057 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx | |
2683 | 4058 ref = h->long_ref[pic_id]; |
4059 ref->pic_id= pic_id; | |
4060 assert(ref->reference == 3); | |
4061 assert(ref->long_ref); | |
4062 i=0; | |
1168 | 4063 } |
4064 | |
2485
2844b8cf4e11
H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents:
2484
diff
changeset
|
4065 if (i < 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4066 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n"); |
1168 | 4067 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME |
2683 | 4068 } else { |
4069 for(i=index; i+1<h->ref_count[list]; i++){ | |
4070 if(ref->long_ref == h->ref_list[list][i].long_ref && ref->pic_id == h->ref_list[list][i].pic_id) | |
4071 break; | |
2650
d321fbf0b2ce
reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents:
2649
diff
changeset
|
4072 } |
d321fbf0b2ce
reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents:
2649
diff
changeset
|
4073 for(; i > index; i--){ |
d321fbf0b2ce
reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents:
2649
diff
changeset
|
4074 h->ref_list[list][i]= h->ref_list[list][i-1]; |
d321fbf0b2ce
reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents:
2649
diff
changeset
|
4075 } |
2683 | 4076 h->ref_list[list][index]= *ref; |
1168 | 4077 } |
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
4078 }else{ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4079 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n"); |
1168 | 4080 return -1; |
4081 } | |
4082 } | |
4083 } | |
4084 | |
4085 if(h->slice_type!=B_TYPE) break; | |
4086 } | |
2680
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
4087 for(list=0; list<2; list++){ |
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
4088 for(index= 0; index < h->ref_count[list]; index++){ |
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
4089 if(!h->ref_list[list][index].data[0]) |
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
4090 h->ref_list[list][index]= s->current_picture; |
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
4091 } |
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
4092 if(h->slice_type!=B_TYPE) break; |
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
4093 } |
2967 | 4094 |
2396 | 4095 if(h->slice_type==B_TYPE && !h->direct_spatial_mv_pred) |
4096 direct_dist_scale_factor(h); | |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
4097 direct_ref_list_init(h); |
2967 | 4098 return 0; |
1168 | 4099 } |
4100 | |
3379
69901769c811
fill_mbaff_ref_list is missing a return statement, its return value
mru
parents:
3341
diff
changeset
|
4101 static void fill_mbaff_ref_list(H264Context *h){ |
3316 | 4102 int list, i, j; |
4103 for(list=0; list<2; list++){ | |
4104 for(i=0; i<h->ref_count[list]; i++){ | |
4105 Picture *frame = &h->ref_list[list][i]; | |
4106 Picture *field = &h->ref_list[list][16+2*i]; | |
4107 field[0] = *frame; | |
4108 for(j=0; j<3; j++) | |
4109 field[0].linesize[j] <<= 1; | |
4110 field[1] = field[0]; | |
4111 for(j=0; j<3; j++) | |
4112 field[1].data[j] += frame->linesize[j]; | |
4113 | |
4114 h->luma_weight[list][16+2*i] = h->luma_weight[list][16+2*i+1] = h->luma_weight[list][i]; | |
4115 h->luma_offset[list][16+2*i] = h->luma_offset[list][16+2*i+1] = h->luma_offset[list][i]; | |
4116 for(j=0; j<2; j++){ | |
4117 h->chroma_weight[list][16+2*i][j] = h->chroma_weight[list][16+2*i+1][j] = h->chroma_weight[list][i][j]; | |
4118 h->chroma_offset[list][16+2*i][j] = h->chroma_offset[list][16+2*i+1][j] = h->chroma_offset[list][i][j]; | |
4119 } | |
4120 } | |
4121 } | |
4122 for(j=0; j<h->ref_count[1]; j++){ | |
4123 for(i=0; i<h->ref_count[0]; i++) | |
4124 h->implicit_weight[j][16+2*i] = h->implicit_weight[j][16+2*i+1] = h->implicit_weight[j][i]; | |
4125 memcpy(h->implicit_weight[16+2*j], h->implicit_weight[j], sizeof(*h->implicit_weight)); | |
4126 memcpy(h->implicit_weight[16+2*j+1], h->implicit_weight[j], sizeof(*h->implicit_weight)); | |
4127 } | |
4128 } | |
4129 | |
1168 | 4130 static int pred_weight_table(H264Context *h){ |
4131 MpegEncContext * const s = &h->s; | |
4132 int list, i; | |
2415 | 4133 int luma_def, chroma_def; |
2967 | 4134 |
2415 | 4135 h->use_weight= 0; |
4136 h->use_weight_chroma= 0; | |
1168 | 4137 h->luma_log2_weight_denom= get_ue_golomb(&s->gb); |
4138 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb); | |
2415 | 4139 luma_def = 1<<h->luma_log2_weight_denom; |
4140 chroma_def = 1<<h->chroma_log2_weight_denom; | |
1168 | 4141 |
4142 for(list=0; list<2; list++){ | |
4143 for(i=0; i<h->ref_count[list]; i++){ | |
4144 int luma_weight_flag, chroma_weight_flag; | |
2967 | 4145 |
1168 | 4146 luma_weight_flag= get_bits1(&s->gb); |
4147 if(luma_weight_flag){ | |
4148 h->luma_weight[list][i]= get_se_golomb(&s->gb); | |
4149 h->luma_offset[list][i]= get_se_golomb(&s->gb); | |
2415 | 4150 if( h->luma_weight[list][i] != luma_def |
4151 || h->luma_offset[list][i] != 0) | |
4152 h->use_weight= 1; | |
4153 }else{ | |
4154 h->luma_weight[list][i]= luma_def; | |
4155 h->luma_offset[list][i]= 0; | |
1168 | 4156 } |
4157 | |
4158 chroma_weight_flag= get_bits1(&s->gb); | |
4159 if(chroma_weight_flag){ | |
4160 int j; | |
4161 for(j=0; j<2; j++){ | |
4162 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb); | |
4163 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb); | |
2415 | 4164 if( h->chroma_weight[list][i][j] != chroma_def |
4165 || h->chroma_offset[list][i][j] != 0) | |
4166 h->use_weight_chroma= 1; | |
4167 } | |
4168 }else{ | |
4169 int j; | |
4170 for(j=0; j<2; j++){ | |
4171 h->chroma_weight[list][i][j]= chroma_def; | |
4172 h->chroma_offset[list][i][j]= 0; | |
1168 | 4173 } |
4174 } | |
4175 } | |
4176 if(h->slice_type != B_TYPE) break; | |
4177 } | |
2415 | 4178 h->use_weight= h->use_weight || h->use_weight_chroma; |
1168 | 4179 return 0; |
4180 } | |
4181 | |
2415 | 4182 static void implicit_weight_table(H264Context *h){ |
4183 MpegEncContext * const s = &h->s; | |
4184 int ref0, ref1; | |
4185 int cur_poc = s->current_picture_ptr->poc; | |
4186 | |
4187 if( h->ref_count[0] == 1 && h->ref_count[1] == 1 | |
4188 && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){ | |
4189 h->use_weight= 0; | |
4190 h->use_weight_chroma= 0; | |
4191 return; | |
4192 } | |
4193 | |
4194 h->use_weight= 2; | |
4195 h->use_weight_chroma= 2; | |
4196 h->luma_log2_weight_denom= 5; | |
4197 h->chroma_log2_weight_denom= 5; | |
4198 | |
4199 for(ref0=0; ref0 < h->ref_count[0]; ref0++){ | |
4200 int poc0 = h->ref_list[0][ref0].poc; | |
4201 for(ref1=0; ref1 < h->ref_count[1]; ref1++){ | |
2519 | 4202 int poc1 = h->ref_list[1][ref1].poc; |
2415 | 4203 int td = clip(poc1 - poc0, -128, 127); |
4204 if(td){ | |
4205 int tb = clip(cur_poc - poc0, -128, 127); | |
4206 int tx = (16384 + (ABS(td) >> 1)) / td; | |
4207 int dist_scale_factor = clip((tb*tx + 32) >> 6, -1024, 1023) >> 2; | |
4208 if(dist_scale_factor < -64 || dist_scale_factor > 128) | |
4209 h->implicit_weight[ref0][ref1] = 32; | |
4210 else | |
4211 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor; | |
4212 }else | |
4213 h->implicit_weight[ref0][ref1] = 32; | |
4214 } | |
4215 } | |
4216 } | |
4217 | |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4218 static inline void unreference_pic(H264Context *h, Picture *pic){ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4219 int i; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4220 pic->reference=0; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4221 if(pic == h->delayed_output_pic) |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4222 pic->reference=1; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4223 else{ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4224 for(i = 0; h->delayed_pic[i]; i++) |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4225 if(pic == h->delayed_pic[i]){ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4226 pic->reference=1; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4227 break; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4228 } |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4229 } |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4230 } |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4231 |
1168 | 4232 /** |
2392 | 4233 * instantaneous decoder refresh. |
1168 | 4234 */ |
4235 static void idr(H264Context *h){ | |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4236 int i; |
1168 | 4237 |
2484
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
4238 for(i=0; i<16; i++){ |
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
4239 if (h->long_ref[i] != NULL) { |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4240 unreference_pic(h, h->long_ref[i]); |
2484
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
4241 h->long_ref[i]= NULL; |
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
4242 } |
1168 | 4243 } |
4244 h->long_ref_count=0; | |
4245 | |
4246 for(i=0; i<h->short_ref_count; i++){ | |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4247 unreference_pic(h, h->short_ref[i]); |
1168 | 4248 h->short_ref[i]= NULL; |
4249 } | |
4250 h->short_ref_count=0; | |
4251 } | |
4252 | |
2640 | 4253 /* forget old pics after a seek */ |
4254 static void flush_dpb(AVCodecContext *avctx){ | |
4255 H264Context *h= avctx->priv_data; | |
4256 int i; | |
3144 | 4257 for(i=0; i<16; i++) { |
4258 if(h->delayed_pic[i]) | |
4259 h->delayed_pic[i]->reference= 0; | |
2640 | 4260 h->delayed_pic[i]= NULL; |
3144 | 4261 } |
4262 if(h->delayed_output_pic) | |
4263 h->delayed_output_pic->reference= 0; | |
2640 | 4264 h->delayed_output_pic= NULL; |
4265 idr(h); | |
2751
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
4266 if(h->s.current_picture_ptr) |
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
4267 h->s.current_picture_ptr->reference= 0; |
2640 | 4268 } |
4269 | |
1168 | 4270 /** |
4271 * | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4272 * @return the removed picture or NULL if an error occurs |
1168 | 4273 */ |
4274 static Picture * remove_short(H264Context *h, int frame_num){ | |
1169 | 4275 MpegEncContext * const s = &h->s; |
1168 | 4276 int i; |
2967 | 4277 |
1169 | 4278 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
|
4279 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count); |
2967 | 4280 |
1168 | 4281 for(i=0; i<h->short_ref_count; i++){ |
4282 Picture *pic= h->short_ref[i]; | |
1169 | 4283 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
|
4284 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic); |
1168 | 4285 if(pic->frame_num == frame_num){ |
4286 h->short_ref[i]= NULL; | |
4287 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*)); | |
4288 h->short_ref_count--; | |
4289 return pic; | |
4290 } | |
4291 } | |
4292 return NULL; | |
4293 } | |
4294 | |
4295 /** | |
4296 * | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4297 * @return the removed picture or NULL if an error occurs |
1168 | 4298 */ |
4299 static Picture * remove_long(H264Context *h, int i){ | |
4300 Picture *pic; | |
4301 | |
4302 pic= h->long_ref[i]; | |
4303 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
|
4304 if(pic) h->long_ref_count--; |
1168 | 4305 |
4306 return pic; | |
4307 } | |
4308 | |
4309 /** | |
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
|
4310 * 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
|
4311 */ |
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
|
4312 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
|
4313 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
|
4314 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
|
4315 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
|
4316 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
|
4317 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
|
4318 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
|
4319 } |
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
|
4320 } |
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
|
4321 } |
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
|
4322 |
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
|
4323 /** |
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
|
4324 * 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
|
4325 */ |
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
|
4326 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
|
4327 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
|
4328 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
|
4329 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
|
4330 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
|
4331 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
|
4332 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
|
4333 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
|
4334 } |
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
|
4335 } |
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
|
4336 } |
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
|
4337 } |
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
|
4338 |
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
|
4339 /** |
1168 | 4340 * Executes the reference picture marking (memory management control operations). |
4341 */ | |
4342 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ | |
4343 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
|
4344 int i, j; |
1168 | 4345 int current_is_long=0; |
4346 Picture *pic; | |
2967 | 4347 |
1168 | 4348 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
|
4349 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n"); |
2967 | 4350 |
1168 | 4351 for(i=0; i<mmco_count; i++){ |
4352 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
|
4353 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 | 4354 |
4355 switch(mmco[i].opcode){ | |
4356 case MMCO_SHORT2UNUSED: | |
4357 pic= remove_short(h, mmco[i].short_frame_num); | |
2766
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4358 if(pic) |
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4359 unreference_pic(h, pic); |
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4360 else if(s->avctx->debug&FF_DEBUG_MMCO) |
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4361 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_short() failure\n"); |
1168 | 4362 break; |
4363 case MMCO_SHORT2LONG: | |
4364 pic= remove_long(h, mmco[i].long_index); | |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4365 if(pic) unreference_pic(h, pic); |
2967 | 4366 |
1168 | 4367 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num); |
4368 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
|
4369 h->long_ref_count++; |
1168 | 4370 break; |
4371 case MMCO_LONG2UNUSED: | |
4372 pic= remove_long(h, mmco[i].long_index); | |
2766
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4373 if(pic) |
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4374 unreference_pic(h, pic); |
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4375 else if(s->avctx->debug&FF_DEBUG_MMCO) |
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4376 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_long() failure\n"); |
1168 | 4377 break; |
4378 case MMCO_LONG: | |
4379 pic= remove_long(h, mmco[i].long_index); | |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4380 if(pic) unreference_pic(h, pic); |
2967 | 4381 |
1168 | 4382 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr; |
4383 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
4384 h->long_ref_count++; | |
2967 | 4385 |
1168 | 4386 current_is_long=1; |
4387 break; | |
4388 case MMCO_SET_MAX_LONG: | |
4389 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
|
4390 // 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
|
4391 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
|
4392 pic = remove_long(h, j); |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4393 if (pic) unreference_pic(h, pic); |
1168 | 4394 } |
4395 break; | |
4396 case MMCO_RESET: | |
4397 while(h->short_ref_count){ | |
4398 pic= remove_short(h, h->short_ref[0]->frame_num); | |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4399 unreference_pic(h, pic); |
1168 | 4400 } |
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
|
4401 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
|
4402 pic= remove_long(h, j); |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4403 if(pic) unreference_pic(h, pic); |
1168 | 4404 } |
4405 break; | |
4406 default: assert(0); | |
4407 } | |
4408 } | |
2967 | 4409 |
1168 | 4410 if(!current_is_long){ |
4411 pic= remove_short(h, s->current_picture_ptr->frame_num); | |
4412 if(pic){ | |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
4413 unreference_pic(h, pic); |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4414 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n"); |
1168 | 4415 } |
2967 | 4416 |
1168 | 4417 if(h->short_ref_count) |
1169 | 4418 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*)); |
4419 | |
4420 h->short_ref[0]= s->current_picture_ptr; | |
1168 | 4421 h->short_ref[0]->long_ref=0; |
4422 h->short_ref_count++; | |
4423 } | |
2967 | 4424 |
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
|
4425 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
|
4426 print_long_term(h); |
2967 | 4427 return 0; |
1168 | 4428 } |
4429 | |
4430 static int decode_ref_pic_marking(H264Context *h){ | |
4431 MpegEncContext * const s = &h->s; | |
4432 int i; | |
2967 | 4433 |
1168 | 4434 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields |
4435 s->broken_link= get_bits1(&s->gb) -1; | |
4436 h->mmco[0].long_index= get_bits1(&s->gb) - 1; // current_long_term_idx | |
4437 if(h->mmco[0].long_index == -1) | |
4438 h->mmco_index= 0; | |
4439 else{ | |
4440 h->mmco[0].opcode= MMCO_LONG; | |
4441 h->mmco_index= 1; | |
2967 | 4442 } |
1168 | 4443 }else{ |
4444 if(get_bits1(&s->gb)){ // adaptive_ref_pic_marking_mode_flag | |
2967 | 4445 for(i= 0; i<MAX_MMCO_COUNT; i++) { |
1168 | 4446 MMCOOpcode opcode= get_ue_golomb(&s->gb);; |
4447 | |
4448 h->mmco[i].opcode= opcode; | |
4449 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){ | |
4450 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 | |
4451 /* if(h->mmco[i].short_frame_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_frame_num ] == NULL){ | |
2846
40765c51a7a9
Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents:
2844
diff
changeset
|
4452 av_log(s->avctx, AV_LOG_ERROR, "illegal short ref in memory management control operation %d\n", mmco); |
1168 | 4453 return -1; |
4454 }*/ | |
4455 } | |
4456 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){ | |
4457 h->mmco[i].long_index= get_ue_golomb(&s->gb); | |
4458 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
|
4459 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); |
1168 | 4460 return -1; |
4461 } | |
4462 } | |
2967 | 4463 |
1168 | 4464 if(opcode > MMCO_LONG){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4465 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); |
1168 | 4466 return -1; |
4467 } | |
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
|
4468 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
|
4469 break; |
1168 | 4470 } |
4471 h->mmco_index= i; | |
4472 }else{ | |
4473 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count); | |
4474 | |
4475 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields | |
4476 h->mmco[0].opcode= MMCO_SHORT2UNUSED; | |
4477 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num; | |
4478 h->mmco_index= 1; | |
4479 }else | |
4480 h->mmco_index= 0; | |
4481 } | |
4482 } | |
2967 | 4483 |
4484 return 0; | |
1168 | 4485 } |
4486 | |
4487 static int init_poc(H264Context *h){ | |
4488 MpegEncContext * const s = &h->s; | |
4489 const int max_frame_num= 1<<h->sps.log2_max_frame_num; | |
4490 int field_poc[2]; | |
4491 | |
4492 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
4493 h->frame_num_offset= 0; | |
4494 }else{ | |
4495 if(h->frame_num < h->prev_frame_num) | |
4496 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num; | |
4497 else | |
4498 h->frame_num_offset= h->prev_frame_num_offset; | |
4499 } | |
4500 | |
4501 if(h->sps.poc_type==0){ | |
4502 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb; | |
4503 | |
2649
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4504 if(h->nal_unit_type == NAL_IDR_SLICE){ |
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4505 h->prev_poc_msb= |
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4506 h->prev_poc_lsb= 0; |
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4507 } |
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4508 |
1168 | 4509 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2) |
4510 h->poc_msb = h->prev_poc_msb + max_poc_lsb; | |
4511 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2) | |
4512 h->poc_msb = h->prev_poc_msb - max_poc_lsb; | |
4513 else | |
4514 h->poc_msb = h->prev_poc_msb; | |
4515 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb); | |
2967 | 4516 field_poc[0] = |
1168 | 4517 field_poc[1] = h->poc_msb + h->poc_lsb; |
2967 | 4518 if(s->picture_structure == PICT_FRAME) |
1168 | 4519 field_poc[1] += h->delta_poc_bottom; |
4520 }else if(h->sps.poc_type==1){ | |
4521 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc; | |
4522 int i; | |
4523 | |
4524 if(h->sps.poc_cycle_length != 0) | |
4525 abs_frame_num = h->frame_num_offset + h->frame_num; | |
4526 else | |
4527 abs_frame_num = 0; | |
4528 | |
4529 if(h->nal_ref_idc==0 && abs_frame_num > 0) | |
4530 abs_frame_num--; | |
2967 | 4531 |
1168 | 4532 expected_delta_per_poc_cycle = 0; |
4533 for(i=0; i < h->sps.poc_cycle_length; i++) | |
4534 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse | |
4535 | |
4536 if(abs_frame_num > 0){ | |
4537 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length; | |
4538 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length; | |
4539 | |
4540 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle; | |
4541 for(i = 0; i <= frame_num_in_poc_cycle; i++) | |
4542 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ]; | |
4543 } else | |
4544 expectedpoc = 0; | |
4545 | |
2967 | 4546 if(h->nal_ref_idc == 0) |
1168 | 4547 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic; |
2967 | 4548 |
1168 | 4549 field_poc[0] = expectedpoc + h->delta_poc[0]; |
4550 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field; | |
4551 | |
4552 if(s->picture_structure == PICT_FRAME) | |
4553 field_poc[1] += h->delta_poc[1]; | |
4554 }else{ | |
4555 int poc; | |
4556 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
4557 poc= 0; | |
4558 }else{ | |
4559 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num); | |
4560 else poc= 2*(h->frame_num_offset + h->frame_num) - 1; | |
4561 } | |
4562 field_poc[0]= poc; | |
4563 field_poc[1]= poc; | |
4564 } | |
2967 | 4565 |
1168 | 4566 if(s->picture_structure != PICT_BOTTOM_FIELD) |
4567 s->current_picture_ptr->field_poc[0]= field_poc[0]; | |
4568 if(s->picture_structure != PICT_TOP_FIELD) | |
4569 s->current_picture_ptr->field_poc[1]= field_poc[1]; | |
4570 if(s->picture_structure == PICT_FRAME) // FIXME field pix? | |
4571 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]); | |
4572 | |
4573 return 0; | |
4574 } | |
4575 | |
4576 /** | |
4577 * decodes a slice header. | |
4578 * this will allso call MPV_common_init() and frame_start() as needed | |
4579 */ | |
4580 static int decode_slice_header(H264Context *h){ | |
4581 MpegEncContext * const s = &h->s; | |
4582 int first_mb_in_slice, pps_id; | |
4583 int num_ref_idx_active_override_flag; | |
4584 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
|
4585 int slice_type; |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4586 int default_ref_list_done = 0; |
1168 | 4587 |
4588 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
|
4589 s->dropable= h->nal_ref_idc == 0; |
1168 | 4590 |
4591 first_mb_in_slice= get_ue_golomb(&s->gb); | |
4592 | |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4593 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
|
4594 if(slice_type > 9){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4595 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 | 4596 return -1; |
1168 | 4597 } |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4598 if(slice_type > 4){ |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4599 slice_type -= 5; |
1168 | 4600 h->slice_type_fixed=1; |
4601 }else | |
4602 h->slice_type_fixed=0; | |
2967 | 4603 |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4604 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
|
4605 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
|
4606 || (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
|
4607 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
|
4608 } |
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4609 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
|
4610 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4611 s->pict_type= h->slice_type; // to make a few old func happy, it's wrong though |
2967 | 4612 |
1168 | 4613 pps_id= get_ue_golomb(&s->gb); |
4614 if(pps_id>255){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4615 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n"); |
1168 | 4616 return -1; |
4617 } | |
4618 h->pps= h->pps_buffer[pps_id]; | |
1174 | 4619 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
|
4620 av_log(h->s.avctx, AV_LOG_ERROR, "non existing PPS referenced\n"); |
1174 | 4621 return -1; |
4622 } | |
4623 | |
1168 | 4624 h->sps= h->sps_buffer[ h->pps.sps_id ]; |
1174 | 4625 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
|
4626 av_log(h->s.avctx, AV_LOG_ERROR, "non existing SPS referenced\n"); |
1174 | 4627 return -1; |
4628 } | |
2919 | 4629 |
4630 if(h->dequant_coeff_pps != pps_id){ | |
4631 h->dequant_coeff_pps = pps_id; | |
4632 init_dequant_tables(h); | |
4633 } | |
2967 | 4634 |
1168 | 4635 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
|
4636 s->mb_height= h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag); |
2967 | 4637 |
3178 | 4638 h->b_stride= s->mb_width*4; |
4639 h->b8_stride= s->mb_width*2; | |
1168 | 4640 |
1371 | 4641 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right ); |
1168 | 4642 if(h->sps.frame_mbs_only_flag) |
1371 | 4643 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom); |
1168 | 4644 else |
1371 | 4645 s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck |
2967 | 4646 |
4647 if (s->context_initialized | |
1548 | 4648 && ( s->width != s->avctx->width || s->height != s->avctx->height)) { |
1168 | 4649 free_tables(h); |
4650 MPV_common_end(s); | |
4651 } | |
4652 if (!s->context_initialized) { | |
4653 if (MPV_common_init(s) < 0) | |
4654 return -1; | |
2967 | 4655 |
2758
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4656 if(s->dsp.h264_idct_add == ff_h264_idct_add_c){ //FIXME little ugly |
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4657 memcpy(h->zigzag_scan, zigzag_scan, 16*sizeof(uint8_t)); |
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4658 memcpy(h-> field_scan, field_scan, 16*sizeof(uint8_t)); |
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4659 }else{ |
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4660 int i; |
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4661 for(i=0; i<16; i++){ |
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4662 #define T(x) (x>>2) | ((x<<2) & 0xF) |
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4663 h->zigzag_scan[i] = T(zigzag_scan[i]); |
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4664 h-> field_scan[i] = T( field_scan[i]); |
3174 | 4665 #undef T |
4666 } | |
4667 } | |
4668 if(s->dsp.h264_idct8_add == ff_h264_idct8_add_c){ | |
3316 | 4669 memcpy(h->zigzag_scan8x8, zigzag_scan8x8, 64*sizeof(uint8_t)); |
3174 | 4670 memcpy(h->zigzag_scan8x8_cavlc, zigzag_scan8x8_cavlc, 64*sizeof(uint8_t)); |
3316 | 4671 memcpy(h->field_scan8x8, field_scan8x8, 64*sizeof(uint8_t)); |
4672 memcpy(h->field_scan8x8_cavlc, field_scan8x8_cavlc, 64*sizeof(uint8_t)); | |
3174 | 4673 }else{ |
4674 int i; | |
4675 for(i=0; i<64; i++){ | |
4676 #define T(x) (x>>3) | ((x&7)<<3) | |
3316 | 4677 h->zigzag_scan8x8[i] = T(zigzag_scan8x8[i]); |
3174 | 4678 h->zigzag_scan8x8_cavlc[i] = T(zigzag_scan8x8_cavlc[i]); |
3316 | 4679 h->field_scan8x8[i] = T(field_scan8x8[i]); |
4680 h->field_scan8x8_cavlc[i] = T(field_scan8x8_cavlc[i]); | |
3174 | 4681 #undef T |
2758
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4682 } |
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4683 } |
2763 | 4684 if(h->sps.transform_bypass){ //FIXME same ugly |
3316 | 4685 h->zigzag_scan_q0 = zigzag_scan; |
4686 h->zigzag_scan8x8_q0 = zigzag_scan8x8; | |
3174 | 4687 h->zigzag_scan8x8_cavlc_q0 = zigzag_scan8x8_cavlc; |
3316 | 4688 h->field_scan_q0 = field_scan; |
4689 h->field_scan8x8_q0 = field_scan8x8; | |
4690 h->field_scan8x8_cavlc_q0 = field_scan8x8_cavlc; | |
2763 | 4691 }else{ |
3316 | 4692 h->zigzag_scan_q0 = h->zigzag_scan; |
4693 h->zigzag_scan8x8_q0 = h->zigzag_scan8x8; | |
3174 | 4694 h->zigzag_scan8x8_cavlc_q0 = h->zigzag_scan8x8_cavlc; |
3316 | 4695 h->field_scan_q0 = h->field_scan; |
4696 h->field_scan8x8_q0 = h->field_scan8x8; | |
4697 h->field_scan8x8_cavlc_q0 = h->field_scan8x8_cavlc; | |
2763 | 4698 } |
1168 | 4699 |
4700 alloc_tables(h); | |
4701 | |
4702 s->avctx->width = s->width; | |
4703 s->avctx->height = s->height; | |
1548 | 4704 s->avctx->sample_aspect_ratio= h->sps.sar; |
2440 | 4705 if(!s->avctx->sample_aspect_ratio.den) |
4706 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
|
4707 |
2648 | 4708 if(h->sps.timing_info_present_flag){ |
3052 | 4709 s->avctx->time_base= (AVRational){h->sps.num_units_in_tick * 2, h->sps.time_scale}; |
3063
f02d0b59279c
Remove all stray tabs and trailing whitespace, this time for good.
diego
parents:
3052
diff
changeset
|
4710 if(h->x264_build > 0 && h->x264_build < 44) |
f02d0b59279c
Remove all stray tabs and trailing whitespace, this time for good.
diego
parents:
3052
diff
changeset
|
4711 s->avctx->time_base.den *= 2; |
f02d0b59279c
Remove all stray tabs and trailing whitespace, this time for good.
diego
parents:
3052
diff
changeset
|
4712 av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den, |
f02d0b59279c
Remove all stray tabs and trailing whitespace, this time for good.
diego
parents:
3052
diff
changeset
|
4713 s->avctx->time_base.num, s->avctx->time_base.den, 1<<30); |
2174
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
4714 } |
1168 | 4715 } |
4716 | |
2392 | 4717 if(h->slice_num == 0){ |
2935 | 4718 if(frame_start(h) < 0) |
4719 return -1; | |
1168 | 4720 } |
4721 | |
1169 | 4722 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup |
1168 | 4723 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num); |
4724 | |
3316 | 4725 h->mb_mbaff = 0; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4726 h->mb_aff_frame = 0; |
1168 | 4727 if(h->sps.frame_mbs_only_flag){ |
4728 s->picture_structure= PICT_FRAME; | |
4729 }else{ | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4730 if(get_bits1(&s->gb)) { //field_pic_flag |
1168 | 4731 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag |
3316 | 4732 av_log(h->s.avctx, AV_LOG_ERROR, "PAFF interlacing is not implemented\n"); |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4733 } else { |
1168 | 4734 s->picture_structure= PICT_FRAME; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4735 h->mb_aff_frame = h->sps.mb_aff; |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4736 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4737 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4738 |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4739 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width; |
3316 | 4740 s->resync_mb_y = s->mb_y = (first_mb_in_slice / s->mb_width) << h->mb_aff_frame; |
2772 | 4741 if(s->mb_y >= s->mb_height){ |
4742 return -1; | |
4743 } | |
2967 | 4744 |
1168 | 4745 if(s->picture_structure==PICT_FRAME){ |
4746 h->curr_pic_num= h->frame_num; | |
4747 h->max_pic_num= 1<< h->sps.log2_max_frame_num; | |
4748 }else{ | |
4749 h->curr_pic_num= 2*h->frame_num; | |
4750 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); | |
4751 } | |
2967 | 4752 |
1168 | 4753 if(h->nal_unit_type == NAL_IDR_SLICE){ |
1453 | 4754 get_ue_golomb(&s->gb); /* idr_pic_id */ |
1168 | 4755 } |
2967 | 4756 |
1168 | 4757 if(h->sps.poc_type==0){ |
4758 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb); | |
2967 | 4759 |
1168 | 4760 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){ |
4761 h->delta_poc_bottom= get_se_golomb(&s->gb); | |
4762 } | |
4763 } | |
2967 | 4764 |
1168 | 4765 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){ |
4766 h->delta_poc[0]= get_se_golomb(&s->gb); | |
2967 | 4767 |
1168 | 4768 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME) |
4769 h->delta_poc[1]= get_se_golomb(&s->gb); | |
4770 } | |
2967 | 4771 |
1168 | 4772 init_poc(h); |
2967 | 4773 |
1168 | 4774 if(h->pps.redundant_pic_cnt_present){ |
4775 h->redundant_pic_count= get_ue_golomb(&s->gb); | |
4776 } | |
4777 | |
4778 //set defaults, might be overriden a few line later | |
4779 h->ref_count[0]= h->pps.ref_count[0]; | |
4780 h->ref_count[1]= h->pps.ref_count[1]; | |
4781 | |
4782 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){ | |
4783 if(h->slice_type == B_TYPE){ | |
4784 h->direct_spatial_mv_pred= get_bits1(&s->gb); | |
3316 | 4785 if(h->sps.mb_aff && h->direct_spatial_mv_pred) |
4786 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + spatial direct mode is not implemented\n"); | |
1168 | 4787 } |
4788 num_ref_idx_active_override_flag= get_bits1(&s->gb); | |
2967 | 4789 |
1168 | 4790 if(num_ref_idx_active_override_flag){ |
4791 h->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
4792 if(h->slice_type==B_TYPE) | |
4793 h->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
4794 | |
4795 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
|
4796 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n"); |
1168 | 4797 return -1; |
4798 } | |
4799 } | |
4800 } | |
4801 | |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4802 if(!default_ref_list_done){ |
1168 | 4803 fill_default_ref_list(h); |
4804 } | |
4805 | |
2766
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4806 if(decode_ref_pic_list_reordering(h) < 0) |
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4807 return -1; |
1168 | 4808 |
2967 | 4809 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE )) |
1168 | 4810 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) ) |
4811 pred_weight_table(h); | |
2415 | 4812 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE) |
4813 implicit_weight_table(h); | |
4814 else | |
4815 h->use_weight = 0; | |
2967 | 4816 |
2580
b4f6f89ec2f6
The cvs version 1.103 of h264.c brokes 13 conformance streams, this
michael
parents:
2561
diff
changeset
|
4817 if(s->current_picture.reference) |
1168 | 4818 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
|
4819 |
3316 | 4820 if(FRAME_MBAFF) |
4821 fill_mbaff_ref_list(h); | |
4822 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4823 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
|
4824 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
|
4825 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4826 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
|
4827 s->qscale = h->pps.init_qp + get_se_golomb(&s->gb); |
1898 | 4828 if(s->qscale<0 || s->qscale>51){ |
4829 av_log(s->avctx, AV_LOG_ERROR, "QP %d out of range\n", s->qscale); | |
4830 return -1; | |
4831 } | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4832 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale); |
1168 | 4833 //FIXME qscale / qp ... stuff |
4834 if(h->slice_type == SP_TYPE){ | |
1453 | 4835 get_bits1(&s->gb); /* sp_for_switch_flag */ |
1168 | 4836 } |
4837 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){ | |
1453 | 4838 get_se_golomb(&s->gb); /* slice_qs_delta */ |
1168 | 4839 } |
4840 | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4841 h->deblocking_filter = 1; |
1898 | 4842 h->slice_alpha_c0_offset = 0; |
4843 h->slice_beta_offset = 0; | |
1168 | 4844 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
|
4845 h->deblocking_filter= get_ue_golomb(&s->gb); |
2967 | 4846 if(h->deblocking_filter < 2) |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4847 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
|
4848 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4849 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
|
4850 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
|
4851 h->slice_beta_offset = get_se_golomb(&s->gb) << 1; |
1168 | 4852 } |
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
|
4853 } |
2792 | 4854 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL |
4855 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type != I_TYPE) | |
4856 ||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR && h->slice_type == B_TYPE) | |
4857 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONREF && h->nal_ref_idc == 0)) | |
4858 h->deblocking_filter= 0; | |
1168 | 4859 |
4860 #if 0 //FMO | |
4861 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5) | |
4862 slice_group_change_cycle= get_bits(&s->gb, ?); | |
4863 #endif | |
4864 | |
2392 | 4865 h->slice_num++; |
4866 | |
3316 | 4867 h->emu_edge_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; |
4868 h->emu_edge_height= FRAME_MBAFF ? 0 : h->emu_edge_width; | |
4869 | |
1168 | 4870 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
2967 | 4871 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:%d:%d weight:%d%s\n", |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4872 h->slice_num, |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4873 (s->picture_structure==PICT_FRAME ? "F" : s->picture_structure==PICT_TOP_FIELD ? "T" : "B"), |
2967 | 4874 first_mb_in_slice, |
1264 | 4875 av_get_pict_type_char(h->slice_type), |
1168 | 4876 pps_id, h->frame_num, |
4877 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], | |
4878 h->ref_count[0], h->ref_count[1], | |
4879 s->qscale, | |
2583 | 4880 h->deblocking_filter, h->slice_alpha_c0_offset/2, h->slice_beta_offset/2, |
2415 | 4881 h->use_weight, |
4882 h->use_weight==1 && h->use_weight_chroma ? "c" : "" | |
1168 | 4883 ); |
4884 } | |
4885 | |
4886 return 0; | |
4887 } | |
4888 | |
4889 /** | |
4890 * | |
4891 */ | |
4892 static inline int get_level_prefix(GetBitContext *gb){ | |
4893 unsigned int buf; | |
4894 int log; | |
2967 | 4895 |
1168 | 4896 OPEN_READER(re, gb); |
4897 UPDATE_CACHE(re, gb); | |
4898 buf=GET_CACHE(re, gb); | |
2967 | 4899 |
1168 | 4900 log= 32 - av_log2(buf); |
4901 #ifdef TRACE | |
4902 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
|
4903 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 | 4904 #endif |
4905 | |
4906 LAST_SKIP_BITS(re, gb, log); | |
4907 CLOSE_READER(re, gb); | |
4908 | |
4909 return log-1; | |
4910 } | |
4911 | |
2755 | 4912 static inline int get_dct8x8_allowed(H264Context *h){ |
4913 int i; | |
4914 for(i=0; i<4; i++){ | |
4915 if(!IS_SUB_8X8(h->sub_mb_type[i]) | |
2781
899a2ea0907c
parenthesing to avoid compiler errors in the future - compared asm outputs, behaviour didnt changed
alex
parents:
2774
diff
changeset
|
4916 || (!h->sps.direct_8x8_inference_flag && IS_DIRECT(h->sub_mb_type[i]))) |
2755 | 4917 return 0; |
4918 } | |
4919 return 1; | |
4920 } | |
4921 | |
1168 | 4922 /** |
4923 * decodes a residual block. | |
4924 * @param n block index | |
4925 * @param scantable scantable | |
4926 * @param max_coeff number of coefficients in the block | |
4927 * @return <0 if an error occured | |
4928 */ | |
2919 | 4929 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff){ |
1168 | 4930 MpegEncContext * const s = &h->s; |
4931 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}; | |
2897 | 4932 int level[16]; |
4933 int zeros_left, coeff_num, coeff_token, total_coeff, i, j, trailing_ones, run_before; | |
1168 | 4934 |
4935 //FIXME put trailing_onex into the context | |
4936 | |
4937 if(n == CHROMA_DC_BLOCK_INDEX){ | |
4938 coeff_token= get_vlc2(gb, chroma_dc_coeff_token_vlc.table, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 1); | |
4939 total_coeff= coeff_token>>2; | |
2967 | 4940 }else{ |
1168 | 4941 if(n == LUMA_DC_BLOCK_INDEX){ |
4942 total_coeff= pred_non_zero_count(h, 0); | |
4943 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
4944 total_coeff= coeff_token>>2; | |
4945 }else{ | |
4946 total_coeff= pred_non_zero_count(h, n); | |
4947 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
4948 total_coeff= coeff_token>>2; | |
4949 h->non_zero_count_cache[ scan8[n] ]= total_coeff; | |
4950 } | |
4951 } | |
4952 | |
4953 //FIXME set last_non_zero? | |
4954 | |
4955 if(total_coeff==0) | |
4956 return 0; | |
2967 | 4957 |
1168 | 4958 trailing_ones= coeff_token&3; |
1170 | 4959 tprintf("trailing:%d, total:%d\n", trailing_ones, total_coeff); |
1168 | 4960 assert(total_coeff<=16); |
2967 | 4961 |
1168 | 4962 for(i=0; i<trailing_ones; i++){ |
4963 level[i]= 1 - 2*get_bits1(gb); | |
4964 } | |
4965 | |
2897 | 4966 if(i<total_coeff) { |
1168 | 4967 int level_code, mask; |
2897 | 4968 int suffix_length = total_coeff > 10 && trailing_ones < 3; |
4969 int prefix= get_level_prefix(gb); | |
4970 | |
4971 //first coefficient has suffix_length equal to 0 or 1 | |
1168 | 4972 if(prefix<14){ //FIXME try to build a large unified VLC table for all this |
4973 if(suffix_length) | |
4974 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
4975 else | |
4976 level_code= (prefix<<suffix_length); //part | |
4977 }else if(prefix==14){ | |
4978 if(suffix_length) | |
4979 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
4980 else | |
4981 level_code= prefix + get_bits(gb, 4); //part | |
4982 }else if(prefix==15){ | |
4983 level_code= (prefix<<suffix_length) + get_bits(gb, 12); //part | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4984 if(suffix_length==0) level_code+=15; //FIXME doesn't make (much)sense |
1168 | 4985 }else{ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4986 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); |
1168 | 4987 return -1; |
4988 } | |
4989 | |
2897 | 4990 if(trailing_ones < 3) level_code += 2; |
4991 | |
4992 suffix_length = 1; | |
4993 if(level_code > 5) | |
4994 suffix_length++; | |
1168 | 4995 mask= -(level_code&1); |
4996 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
2897 | 4997 i++; |
4998 | |
4999 //remaining coefficients have suffix_length > 0 | |
5000 for(;i<total_coeff;i++) { | |
5001 static const int suffix_limit[7] = {0,5,11,23,47,95,INT_MAX }; | |
5002 prefix = get_level_prefix(gb); | |
5003 if(prefix<15){ | |
5004 level_code = (prefix<<suffix_length) + get_bits(gb, suffix_length); | |
5005 }else if(prefix==15){ | |
5006 level_code = (prefix<<suffix_length) + get_bits(gb, 12); | |
5007 }else{ | |
5008 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); | |
5009 return -1; | |
5010 } | |
5011 mask= -(level_code&1); | |
5012 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
5013 if(level_code > suffix_limit[suffix_length]) | |
5014 suffix_length++; | |
5015 } | |
1168 | 5016 } |
5017 | |
5018 if(total_coeff == max_coeff) | |
5019 zeros_left=0; | |
5020 else{ | |
5021 if(n == CHROMA_DC_BLOCK_INDEX) | |
5022 zeros_left= get_vlc2(gb, chroma_dc_total_zeros_vlc[ total_coeff-1 ].table, CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 1); | |
5023 else | |
5024 zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1); | |
5025 } | |
2897 | 5026 |
5027 coeff_num = zeros_left + total_coeff - 1; | |
5028 j = scantable[coeff_num]; | |
5029 if(n > 24){ | |
5030 block[j] = level[0]; | |
5031 for(i=1;i<total_coeff;i++) { | |
5032 if(zeros_left <= 0) | |
5033 run_before = 0; | |
5034 else if(zeros_left < 7){ | |
5035 run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
5036 }else{ | |
5037 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
5038 } | |
5039 zeros_left -= run_before; | |
5040 coeff_num -= 1 + run_before; | |
5041 j= scantable[ coeff_num ]; | |
5042 | |
5043 block[j]= level[i]; | |
5044 } | |
5045 }else{ | |
2919 | 5046 block[j] = (level[0] * qmul[j] + 32)>>6; |
2897 | 5047 for(i=1;i<total_coeff;i++) { |
5048 if(zeros_left <= 0) | |
5049 run_before = 0; | |
5050 else if(zeros_left < 7){ | |
5051 run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
5052 }else{ | |
5053 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
5054 } | |
5055 zeros_left -= run_before; | |
5056 coeff_num -= 1 + run_before; | |
5057 j= scantable[ coeff_num ]; | |
5058 | |
2919 | 5059 block[j]= (level[i] * qmul[j] + 32)>>6; |
2897 | 5060 } |
1168 | 5061 } |
5062 | |
5063 if(zeros_left<0){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5064 av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y); |
1168 | 5065 return -1; |
5066 } | |
2897 | 5067 |
1168 | 5068 return 0; |
5069 } | |
5070 | |
3316 | 5071 static void predict_field_decoding_flag(H264Context *h){ |
5072 MpegEncContext * const s = &h->s; | |
5073 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; | |
5074 int mb_type = (h->slice_table[mb_xy-1] == h->slice_num) | |
5075 ? s->current_picture.mb_type[mb_xy-1] | |
5076 : (h->slice_table[mb_xy-s->mb_stride] == h->slice_num) | |
5077 ? s->current_picture.mb_type[mb_xy-s->mb_stride] | |
5078 : 0; | |
5079 h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0; | |
5080 } | |
5081 | |
1168 | 5082 /** |
2396 | 5083 * decodes a P_SKIP or B_SKIP macroblock |
5084 */ | |
5085 static void decode_mb_skip(H264Context *h){ | |
5086 MpegEncContext * const s = &h->s; | |
5087 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; | |
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
5088 int mb_type=0; |
2967 | 5089 |
2396 | 5090 memset(h->non_zero_count[mb_xy], 0, 16); |
5091 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui | |
5092 | |
3316 | 5093 if(MB_FIELD) |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
5094 mb_type|= MB_TYPE_INTERLACED; |
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
5095 |
2396 | 5096 if( h->slice_type == B_TYPE ) |
5097 { | |
5098 // just for fill_caches. pred_direct_motion will set the real mb_type | |
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
5099 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP; |
2396 | 5100 |
2449 | 5101 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
2396 | 5102 pred_direct_motion(h, &mb_type); |
5103 if(h->pps.cabac){ | |
5104 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
5105 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
5106 } | |
5107 } | |
5108 else | |
5109 { | |
5110 int mx, my; | |
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
5111 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; |
2396 | 5112 |
2449 | 5113 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
2396 | 5114 pred_pskip_motion(h, &mx, &my); |
5115 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
5116 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); | |
5117 if(h->pps.cabac) | |
5118 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
5119 } | |
5120 | |
5121 write_back_motion(h, mb_type); | |
5122 s->current_picture.mb_type[mb_xy]= mb_type|MB_TYPE_SKIP; | |
5123 s->current_picture.qscale_table[mb_xy]= s->qscale; | |
5124 h->slice_table[ mb_xy ]= h->slice_num; | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
5125 h->prev_mb_skipped= 1; |
2396 | 5126 } |
5127 | |
5128 /** | |
1168 | 5129 * decodes a macroblock |
5130 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed | |
5131 */ | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5132 static int decode_mb_cavlc(H264Context *h){ |
1168 | 5133 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
|
5134 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1169 | 5135 int mb_type, partition_count, cbp; |
2755 | 5136 int dct8x8_allowed= h->pps.transform_8x8_mode; |
1168 | 5137 |
2967 | 5138 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong? |
1168 | 5139 |
1170 | 5140 tprintf("pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
1453 | 5141 cbp = 0; /* avoid warning. FIXME: find a solution without slowing |
5142 down the code */ | |
1168 | 5143 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){ |
5144 if(s->mb_skip_run==-1) | |
5145 s->mb_skip_run= get_ue_golomb(&s->gb); | |
2967 | 5146 |
1168 | 5147 if (s->mb_skip_run--) { |
3316 | 5148 if(FRAME_MBAFF && (s->mb_y&1) == 0){ |
5149 if(s->mb_skip_run==0) | |
5150 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb); | |
5151 else | |
5152 predict_field_decoding_flag(h); | |
5153 } | |
2396 | 5154 decode_mb_skip(h); |
1168 | 5155 return 0; |
5156 } | |
5157 } | |
3316 | 5158 if(FRAME_MBAFF){ |
5159 if( (s->mb_y&1) == 0 ) | |
5160 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb); | |
1168 | 5161 }else |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5162 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); |
2967 | 5163 |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
5164 h->prev_mb_skipped= 0; |
2967 | 5165 |
1168 | 5166 mb_type= get_ue_golomb(&s->gb); |
5167 if(h->slice_type == B_TYPE){ | |
5168 if(mb_type < 23){ | |
5169 partition_count= b_mb_type_info[mb_type].partition_count; | |
5170 mb_type= b_mb_type_info[mb_type].type; | |
5171 }else{ | |
5172 mb_type -= 23; | |
5173 goto decode_intra_mb; | |
5174 } | |
5175 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){ | |
5176 if(mb_type < 5){ | |
5177 partition_count= p_mb_type_info[mb_type].partition_count; | |
5178 mb_type= p_mb_type_info[mb_type].type; | |
5179 }else{ | |
5180 mb_type -= 5; | |
5181 goto decode_intra_mb; | |
5182 } | |
5183 }else{ | |
5184 assert(h->slice_type == I_TYPE); | |
5185 decode_intra_mb: | |
5186 if(mb_type > 25){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5187 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 | 5188 return -1; |
5189 } | |
5190 partition_count=0; | |
5191 cbp= i_mb_type_info[mb_type].cbp; | |
5192 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; | |
5193 mb_type= i_mb_type_info[mb_type].type; | |
5194 } | |
5195 | |
3316 | 5196 if(MB_FIELD) |
1168 | 5197 mb_type |= MB_TYPE_INTERLACED; |
5198 | |
5199 h->slice_table[ mb_xy ]= h->slice_num; | |
2967 | 5200 |
1168 | 5201 if(IS_INTRA_PCM(mb_type)){ |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5202 unsigned int x, y; |
2967 | 5203 |
1168 | 5204 // we assume these blocks are very rare so we dont optimize it |
5205 align_get_bits(&s->gb); | |
2967 | 5206 |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5207 // The pixels are stored in the same order as levels in h->mb array. |
1168 | 5208 for(y=0; y<16; y++){ |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5209 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3); |
1168 | 5210 for(x=0; x<16; x++){ |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5211 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
|
5212 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= get_bits(&s->gb, 8); |
1168 | 5213 } |
5214 } | |
5215 for(y=0; y<8; y++){ | |
5216 const int index= 256 + 4*(y&3) + 32*(y>>2); | |
5217 for(x=0; x<8; x++){ | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5218 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
|
5219 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
1168 | 5220 } |
5221 } | |
5222 for(y=0; y<8; y++){ | |
5223 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); | |
5224 for(x=0; x<8; x++){ | |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5225 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
|
5226 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
1168 | 5227 } |
5228 } | |
2967 | 5229 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5230 // In deblocking, the quantizer is 0 |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5231 s->current_picture.qscale_table[mb_xy]= 0; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
5232 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, 0); |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5233 // All coeffs are present |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5234 memset(h->non_zero_count[mb_xy], 16, 16); |
2967 | 5235 |
2755 | 5236 s->current_picture.mb_type[mb_xy]= mb_type; |
1168 | 5237 return 0; |
5238 } | |
2967 | 5239 |
3316 | 5240 if(MB_MBAFF){ |
5241 h->ref_count[0] <<= 1; | |
5242 h->ref_count[1] <<= 1; | |
5243 } | |
5244 | |
2449 | 5245 fill_caches(h, mb_type, 0); |
1168 | 5246 |
5247 //mb_pred | |
5248 if(IS_INTRA(mb_type)){ | |
5249 // init_top_left_availability(h); | |
5250 if(IS_INTRA4x4(mb_type)){ | |
5251 int i; | |
2755 | 5252 int di = 1; |
5253 if(dct8x8_allowed && get_bits1(&s->gb)){ | |
5254 mb_type |= MB_TYPE_8x8DCT; | |
5255 di = 4; | |
5256 } | |
1168 | 5257 |
5258 // fill_intra4x4_pred_table(h); | |
2755 | 5259 for(i=0; i<16; i+=di){ |
3409 | 5260 int mode= pred_intra_mode(h, i); |
5261 | |
5262 if(!get_bits1(&s->gb)){ | |
1168 | 5263 const int rem_mode= get_bits(&s->gb, 3); |
3409 | 5264 mode = rem_mode + (rem_mode >= mode); |
1168 | 5265 } |
2967 | 5266 |
2755 | 5267 if(di==4) |
5268 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 ); | |
5269 else | |
5270 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode; | |
1168 | 5271 } |
5272 write_back_intra_pred_mode(h); | |
5273 if( check_intra4x4_pred_mode(h) < 0) | |
5274 return -1; | |
5275 }else{ | |
5276 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode); | |
5277 if(h->intra16x16_pred_mode < 0) | |
5278 return -1; | |
5279 } | |
5280 h->chroma_pred_mode= get_ue_golomb(&s->gb); | |
5281 | |
5282 h->chroma_pred_mode= check_intra_pred_mode(h, h->chroma_pred_mode); | |
5283 if(h->chroma_pred_mode < 0) | |
5284 return -1; | |
5285 }else if(partition_count==4){ | |
5286 int i, j, sub_partition_count[4], list, ref[2][4]; | |
2967 | 5287 |
1168 | 5288 if(h->slice_type == B_TYPE){ |
5289 for(i=0; i<4; i++){ | |
5290 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
5291 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
|
5292 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 | 5293 return -1; |
5294 } | |
5295 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
5296 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
5297 } | |
2396 | 5298 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1]) |
3003 | 5299 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) { |
2396 | 5300 pred_direct_motion(h, &mb_type); |
3003 | 5301 h->ref_cache[0][scan8[4]] = |
5302 h->ref_cache[1][scan8[4]] = | |
5303 h->ref_cache[0][scan8[12]] = | |
5304 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE; | |
5305 } | |
1168 | 5306 }else{ |
5307 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ? | |
5308 for(i=0; i<4; i++){ | |
5309 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
5310 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
|
5311 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 | 5312 return -1; |
5313 } | |
5314 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
5315 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
5316 } | |
5317 } | |
2967 | 5318 |
1168 | 5319 for(list=0; list<2; list++){ |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5320 int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; |
1168 | 5321 if(ref_count == 0) continue; |
5322 for(i=0; i<4; i++){ | |
2396 | 5323 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
5324 if(IS_DIR(h->sub_mb_type[i], 0, list)){ | |
1168 | 5325 ref[list][i] = get_te0_golomb(&s->gb, ref_count); //FIXME init to 0 before and skip? |
5326 }else{ | |
5327 //FIXME | |
5328 ref[list][i] = -1; | |
5329 } | |
5330 } | |
5331 } | |
2967 | 5332 |
2755 | 5333 if(dct8x8_allowed) |
5334 dct8x8_allowed = get_dct8x8_allowed(h); | |
2967 | 5335 |
1168 | 5336 for(list=0; list<2; list++){ |
5337 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; | |
5338 if(ref_count == 0) continue; | |
5339 | |
5340 for(i=0; i<4; i++){ | |
3003 | 5341 if(IS_DIRECT(h->sub_mb_type[i])) { |
5342 h->ref_cache[list][ scan8[4*i] ] = h->ref_cache[list][ scan8[4*i]+1 ]; | |
5343 continue; | |
5344 } | |
1168 | 5345 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]= |
5346 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i]; | |
5347 | |
2396 | 5348 if(IS_DIR(h->sub_mb_type[i], 0, list)){ |
1168 | 5349 const int sub_mb_type= h->sub_mb_type[i]; |
5350 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1; | |
5351 for(j=0; j<sub_partition_count[i]; j++){ | |
5352 int mx, my; | |
5353 const int index= 4*i + block_width*j; | |
5354 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ]; | |
5355 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my); | |
5356 mx += get_se_golomb(&s->gb); | |
5357 my += get_se_golomb(&s->gb); | |
1170 | 5358 tprintf("final mv:%d %d\n", mx, my); |
5359 | |
1168 | 5360 if(IS_SUB_8X8(sub_mb_type)){ |
2967 | 5361 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= |
1168 | 5362 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; |
2967 | 5363 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= |
1168 | 5364 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my; |
5365 }else if(IS_SUB_8X4(sub_mb_type)){ | |
5366 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx; | |
5367 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my; | |
5368 }else if(IS_SUB_4X8(sub_mb_type)){ | |
5369 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx; | |
5370 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my; | |
5371 }else{ | |
5372 assert(IS_SUB_4X4(sub_mb_type)); | |
5373 mv_cache[ 0 ][0]= mx; | |
5374 mv_cache[ 0 ][1]= my; | |
5375 } | |
5376 } | |
5377 }else{ | |
5378 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0]; | |
5379 p[0] = p[1]= | |
5380 p[8] = p[9]= 0; | |
5381 } | |
5382 } | |
5383 } | |
2396 | 5384 }else if(IS_DIRECT(mb_type)){ |
5385 pred_direct_motion(h, &mb_type); | |
2755 | 5386 dct8x8_allowed &= h->sps.direct_8x8_inference_flag; |
2396 | 5387 }else{ |
1168 | 5388 int list, mx, my, i; |
5389 //FIXME we should set ref_idx_l? to 0 if we use that later ... | |
5390 if(IS_16X16(mb_type)){ | |
5391 for(list=0; list<2; list++){ | |
2392 | 5392 if(h->ref_count[list]>0){ |
1168 | 5393 if(IS_DIR(mb_type, 0, list)){ |
5394 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
5395 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | |
2523 | 5396 }else |
5397 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (LIST_NOT_USED&0xFF), 1); | |
1168 | 5398 } |
5399 } | |
5400 for(list=0; list<2; list++){ | |
5401 if(IS_DIR(mb_type, 0, list)){ | |
5402 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); | |
5403 mx += get_se_golomb(&s->gb); | |
5404 my += get_se_golomb(&s->gb); | |
1170 | 5405 tprintf("final mv:%d %d\n", mx, my); |
5406 | |
1269 | 5407 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
2523 | 5408 }else |
5409 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4); | |
1168 | 5410 } |
5411 } | |
5412 else if(IS_16X8(mb_type)){ | |
5413 for(list=0; list<2; list++){ | |
5414 if(h->ref_count[list]>0){ | |
5415 for(i=0; i<2; i++){ | |
5416 if(IS_DIR(mb_type, i, list)){ | |
5417 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
5418 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); | |
2523 | 5419 }else |
2396 | 5420 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, (LIST_NOT_USED&0xFF), 1); |
1168 | 5421 } |
5422 } | |
5423 } | |
5424 for(list=0; list<2; list++){ | |
5425 for(i=0; i<2; i++){ | |
5426 if(IS_DIR(mb_type, i, list)){ | |
5427 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my); | |
5428 mx += get_se_golomb(&s->gb); | |
5429 my += get_se_golomb(&s->gb); | |
1170 | 5430 tprintf("final mv:%d %d\n", mx, my); |
5431 | |
1269 | 5432 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
2396 | 5433 }else |
5434 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); | |
1168 | 5435 } |
5436 } | |
5437 }else{ | |
5438 assert(IS_8X16(mb_type)); | |
5439 for(list=0; list<2; list++){ | |
5440 if(h->ref_count[list]>0){ | |
5441 for(i=0; i<2; i++){ | |
5442 if(IS_DIR(mb_type, i, list)){ //FIXME optimize | |
5443 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
5444 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); | |
2523 | 5445 }else |
2396 | 5446 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, (LIST_NOT_USED&0xFF), 1); |
1168 | 5447 } |
5448 } | |
5449 } | |
5450 for(list=0; list<2; list++){ | |
5451 for(i=0; i<2; i++){ | |
5452 if(IS_DIR(mb_type, i, list)){ | |
5453 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my); | |
5454 mx += get_se_golomb(&s->gb); | |
5455 my += get_se_golomb(&s->gb); | |
1170 | 5456 tprintf("final mv:%d %d\n", mx, my); |
5457 | |
1269 | 5458 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
2396 | 5459 }else |
5460 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); | |
1168 | 5461 } |
5462 } | |
5463 } | |
5464 } | |
2967 | 5465 |
1168 | 5466 if(IS_INTER(mb_type)) |
5467 write_back_motion(h, mb_type); | |
2967 | 5468 |
1168 | 5469 if(!IS_INTRA16x16(mb_type)){ |
5470 cbp= get_ue_golomb(&s->gb); | |
5471 if(cbp > 47){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5472 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%d) at %d %d\n", cbp, s->mb_x, s->mb_y); |
1168 | 5473 return -1; |
5474 } | |
2967 | 5475 |
1168 | 5476 if(IS_INTRA4x4(mb_type)) |
5477 cbp= golomb_to_intra4x4_cbp[cbp]; | |
5478 else | |
5479 cbp= golomb_to_inter_cbp[cbp]; | |
5480 } | |
5481 | |
2755 | 5482 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){ |
5483 if(get_bits1(&s->gb)) | |
5484 mb_type |= MB_TYPE_8x8DCT; | |
5485 } | |
5486 s->current_picture.mb_type[mb_xy]= mb_type; | |
5487 | |
1168 | 5488 if(cbp || IS_INTRA16x16(mb_type)){ |
5489 int i8x8, i4x4, chroma_idx; | |
5490 int chroma_qp, dquant; | |
5491 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr; | |
3174 | 5492 const uint8_t *scan, *scan8x8, *dc_scan; |
2967 | 5493 |
1168 | 5494 // fill_non_zero_count_cache(h); |
5495 | |
5496 if(IS_INTERLACED(mb_type)){ | |
3316 | 5497 scan8x8= s->qscale ? h->field_scan8x8_cavlc : h->field_scan8x8_cavlc_q0; |
2763 | 5498 scan= s->qscale ? h->field_scan : h->field_scan_q0; |
1168 | 5499 dc_scan= luma_dc_field_scan; |
5500 }else{ | |
3316 | 5501 scan8x8= s->qscale ? h->zigzag_scan8x8_cavlc : h->zigzag_scan8x8_cavlc_q0; |
2763 | 5502 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0; |
1168 | 5503 dc_scan= luma_dc_zigzag_scan; |
5504 } | |
5505 | |
5506 dquant= get_se_golomb(&s->gb); | |
5507 | |
5508 if( dquant > 25 || dquant < -26 ){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5509 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 | 5510 return -1; |
5511 } | |
2967 | 5512 |
1168 | 5513 s->qscale += dquant; |
5514 if(((unsigned)s->qscale) > 51){ | |
5515 if(s->qscale<0) s->qscale+= 52; | |
5516 else s->qscale-= 52; | |
5517 } | |
2967 | 5518 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
5519 h->chroma_qp= chroma_qp= get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale); |
1168 | 5520 if(IS_INTRA16x16(mb_type)){ |
2919 | 5521 if( decode_residual(h, h->intra_gb_ptr, h->mb, LUMA_DC_BLOCK_INDEX, dc_scan, h->dequant4_coeff[0][s->qscale], 16) < 0){ |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5522 return -1; //FIXME continue if partitioned and other return -1 too |
1168 | 5523 } |
5524 | |
5525 assert((cbp&15) == 0 || (cbp&15) == 15); | |
5526 | |
5527 if(cbp&15){ | |
5528 for(i8x8=0; i8x8<4; i8x8++){ | |
5529 for(i4x4=0; i4x4<4; i4x4++){ | |
5530 const int index= i4x4 + 4*i8x8; | |
2919 | 5531 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[0][s->qscale], 15) < 0 ){ |
1168 | 5532 return -1; |
5533 } | |
5534 } | |
5535 } | |
5536 }else{ | |
1636 | 5537 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1); |
1168 | 5538 } |
5539 }else{ | |
5540 for(i8x8=0; i8x8<4; i8x8++){ | |
5541 if(cbp & (1<<i8x8)){ | |
2755 | 5542 if(IS_8x8DCT(mb_type)){ |
5543 DCTELEM *buf = &h->mb[64*i8x8]; | |
2757 | 5544 uint8_t *nnz; |
2755 | 5545 for(i4x4=0; i4x4<4; i4x4++){ |
3174 | 5546 if( decode_residual(h, gb, buf, i4x4+4*i8x8, scan8x8+16*i4x4, |
2919 | 5547 h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 16) <0 ) |
2755 | 5548 return -1; |
5549 } | |
2757 | 5550 nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
5551 nnz[0] += nnz[1] + nnz[8] + nnz[9]; |
2755 | 5552 }else{ |
5553 for(i4x4=0; i4x4<4; i4x4++){ | |
5554 const int index= i4x4 + 4*i8x8; | |
2967 | 5555 |
2919 | 5556 if( decode_residual(h, gb, h->mb + 16*index, index, scan, h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale], 16) <0 ){ |
2755 | 5557 return -1; |
5558 } | |
1168 | 5559 } |
5560 } | |
5561 }else{ | |
5562 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; | |
5563 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; | |
5564 } | |
5565 } | |
5566 } | |
2967 | 5567 |
1168 | 5568 if(cbp&0x30){ |
5569 for(chroma_idx=0; chroma_idx<2; chroma_idx++) | |
2919 | 5570 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, NULL, 4) < 0){ |
1168 | 5571 return -1; |
5572 } | |
5573 } | |
5574 | |
5575 if(cbp&0x20){ | |
5576 for(chroma_idx=0; chroma_idx<2; chroma_idx++){ | |
5577 for(i4x4=0; i4x4<4; i4x4++){ | |
5578 const int index= 16 + 4*chroma_idx + i4x4; | |
2919 | 5579 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[chroma_idx+1+(IS_INTRA( mb_type ) ? 0:3)][chroma_qp], 15) < 0){ |
1168 | 5580 return -1; |
5581 } | |
5582 } | |
5583 } | |
5584 }else{ | |
5585 uint8_t * const nnz= &h->non_zero_count_cache[0]; | |
5586 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
5587 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
5588 } | |
5589 }else{ | |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5590 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
|
5591 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
|
5592 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
|
5593 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; |
1168 | 5594 } |
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
|
5595 s->current_picture.qscale_table[mb_xy]= s->qscale; |
1168 | 5596 write_back_non_zero_count(h); |
5597 | |
3316 | 5598 if(MB_MBAFF){ |
5599 h->ref_count[0] >>= 1; | |
5600 h->ref_count[1] >>= 1; | |
5601 } | |
5602 | |
1168 | 5603 return 0; |
5604 } | |
5605 | |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5606 static int decode_cabac_field_decoding_flag(H264Context *h) { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5607 MpegEncContext * const s = &h->s; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5608 const int mb_x = s->mb_x; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5609 const int mb_y = s->mb_y & ~1; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5610 const int mba_xy = mb_x - 1 + mb_y *s->mb_stride; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5611 const int mbb_xy = mb_x + (mb_y-2)*s->mb_stride; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5612 |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5613 unsigned int ctx = 0; |
2967 | 5614 |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5615 if( h->slice_table[mba_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) ) { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5616 ctx += 1; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5617 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5618 if( h->slice_table[mbb_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) ) { |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5619 ctx += 1; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5620 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5621 |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5622 return get_cabac( &h->cabac, &h->cabac_state[70 + ctx] ); |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5623 } |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5624 |
2312 | 5625 static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_slice) { |
5626 uint8_t *state= &h->cabac_state[ctx_base]; | |
5627 int mb_type; | |
2967 | 5628 |
2312 | 5629 if(intra_slice){ |
5630 MpegEncContext * const s = &h->s; | |
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5631 const int mba_xy = h->left_mb_xy[0]; |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5632 const int mbb_xy = h->top_mb_xy; |
2312 | 5633 int ctx=0; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5634 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
|
5635 ctx++; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5636 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
|
5637 ctx++; |
2312 | 5638 if( get_cabac( &h->cabac, &state[ctx] ) == 0 ) |
5639 return 0; /* I4x4 */ | |
5640 state += 2; | |
5641 }else{ | |
5642 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
|
5643 return 0; /* I4x4 */ |
2312 | 5644 } |
5645 | |
5646 if( get_cabac_terminate( &h->cabac ) ) | |
5647 return 25; /* PCM */ | |
5648 | |
5649 mb_type = 1; /* I16x16 */ | |
3138 | 5650 mb_type += 12 * get_cabac( &h->cabac, &state[1] ); /* cbp_luma != 0 */ |
5651 if( get_cabac( &h->cabac, &state[2] ) ) /* cbp_chroma */ | |
5652 mb_type += 4 + 4 * get_cabac( &h->cabac, &state[2+intra_slice] ); | |
5653 mb_type += 2 * get_cabac( &h->cabac, &state[3+intra_slice] ); | |
5654 mb_type += 1 * get_cabac( &h->cabac, &state[3+2*intra_slice] ); | |
2312 | 5655 return mb_type; |
5656 } | |
5657 | |
5658 static int decode_cabac_mb_type( H264Context *h ) { | |
5659 MpegEncContext * const s = &h->s; | |
5660 | |
5661 if( h->slice_type == I_TYPE ) { | |
5662 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
|
5663 } 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
|
5664 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
|
5665 /* 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
|
5666 if( get_cabac( &h->cabac, &h->cabac_state[15] ) == 0 ) { |
3138 | 5667 /* P_L0_D16x16, P_8x8 */ |
5668 return 3 * get_cabac( &h->cabac, &h->cabac_state[16] ); | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5669 } else { |
3138 | 5670 /* P_L0_D8x16, P_L0_D16x8 */ |
5671 return 2 - get_cabac( &h->cabac, &h->cabac_state[17] ); | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5672 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5673 } else { |
2312 | 5674 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
|
5675 } |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5676 } else if( h->slice_type == B_TYPE ) { |
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5677 const int mba_xy = h->left_mb_xy[0]; |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5678 const int mbb_xy = h->top_mb_xy; |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5679 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
|
5680 int bits; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5681 |
3138 | 5682 if( h->slice_table[mba_xy] == h->slice_num && !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
|
5683 ctx++; |
3138 | 5684 if( h->slice_table[mbb_xy] == h->slice_num && !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
|
5685 ctx++; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5686 |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5687 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
|
5688 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
|
5689 |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5690 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
|
5691 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
|
5692 } |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5693 |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5694 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
|
5695 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
|
5696 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
|
5697 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
|
5698 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
|
5699 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
|
5700 else if( bits == 13 ) { |
2312 | 5701 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
|
5702 } 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
|
5703 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
|
5704 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
|
5705 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
|
5706 |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5707 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
|
5708 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
|
5709 } else { |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5710 /* 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
|
5711 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
|
5712 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5713 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5714 |
3316 | 5715 static int decode_cabac_mb_skip( H264Context *h, int mb_x, int 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
|
5716 MpegEncContext * const s = &h->s; |
3316 | 5717 int mba_xy, 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
|
5718 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
|
5719 |
3316 | 5720 if(FRAME_MBAFF){ //FIXME merge with the stuff in fill_caches? |
5721 int mb_xy = mb_x + (mb_y&~1)*s->mb_stride; | |
5722 mba_xy = mb_xy - 1; | |
5723 if( (mb_y&1) | |
5724 && h->slice_table[mba_xy] == h->slice_num | |
5725 && MB_FIELD == !!IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) ) | |
5726 mba_xy += s->mb_stride; | |
5727 if( MB_FIELD ){ | |
5728 mbb_xy = mb_xy - s->mb_stride; | |
5729 if( !(mb_y&1) | |
5730 && h->slice_table[mbb_xy] == h->slice_num | |
5731 && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) ) | |
5732 mbb_xy -= s->mb_stride; | |
5733 }else | |
5734 mbb_xy = mb_x + (mb_y-1)*s->mb_stride; | |
5735 }else{ | |
5736 int mb_xy = mb_x + mb_y*s->mb_stride; | |
5737 mba_xy = mb_xy - 1; | |
5738 mbb_xy = mb_xy - s->mb_stride; | |
5739 } | |
5740 | |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5741 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
|
5742 ctx++; |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5743 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
|
5744 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5745 |
3138 | 5746 if( h->slice_type == B_TYPE ) |
5747 ctx += 13; | |
5748 return get_cabac( &h->cabac, &h->cabac_state[11+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
|
5749 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5750 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5751 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
|
5752 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
|
5753 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5754 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
|
5755 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
|
5756 |
2928 | 5757 mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] ); |
5758 mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] ); | |
5759 mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] ); | |
5760 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5761 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
|
5762 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
|
5763 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5764 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
|
5765 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5766 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5767 static int decode_cabac_mb_chroma_pre_mode( H264Context *h) { |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5768 const int mba_xy = h->left_mb_xy[0]; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5769 const int mbb_xy = h->top_mb_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
|
5770 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5771 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
|
5772 |
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
|
5773 /* 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
|
5774 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
|
5775 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
|
5776 |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5777 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
|
5778 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5779 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5780 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
|
5781 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
|
5782 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5783 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
|
5784 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
|
5785 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
|
5786 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
|
5787 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5788 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
|
5789 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5790 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5791 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
|
5792 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
|
5793 }; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5794 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
|
5795 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
|
5796 }; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5797 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
|
5798 { 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
|
5799 { 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
|
5800 { 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
|
5801 { 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
|
5802 }; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5803 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5804 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
|
5805 int cbp = 0; |
3138 | 5806 int cbp_b = -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
|
5807 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
|
5808 |
3138 | 5809 if( h->slice_table[h->top_mb_xy] == h->slice_num ) { |
5810 cbp_b = h->top_cbp; | |
5811 tprintf("cbp_b = top_cbp = %x\n", cbp_b); | |
5812 } | |
5813 | |
1908
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( i8x8 = 0; i8x8 < 4; i8x8++ ) { |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5815 int cbp_a = -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
|
5816 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
|
5817 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
|
5818 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5819 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
|
5820 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
|
5821 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5822 if( x > 0 ) |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5823 cbp_a = cbp; |
3138 | 5824 else if( h->slice_table[h->left_mb_xy[0]] == h->slice_num ) { |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5825 cbp_a = h->left_cbp; |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5826 tprintf("cbp_a = left_cbp = %x\n", cbp_a); |
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5827 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5828 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5829 if( y > 0 ) |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5830 cbp_b = cbp; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5831 |
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
|
5832 /* 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
|
5833 /* No need to test for IPCM as we put 1 for IPCM block */ |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5834 if( cbp_a >= 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
|
5835 int i8x8a = block_idx_xy[(x-1)&0x03][y]/4; |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5836 if( ((cbp_a >> 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
|
5837 ctx++; |
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 |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5840 if( cbp_b >= 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
|
5841 int i8x8b = block_idx_xy[x][(y-1)&0x03]/4; |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5842 if( ((cbp_b >> 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
|
5843 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
|
5844 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5845 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5846 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
|
5847 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
|
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 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
|
5851 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5852 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
|
5853 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
|
5854 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
|
5855 |
2314 | 5856 cbp_a = (h->left_cbp>>4)&0x03; |
5857 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
|
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 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
|
5860 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
|
5861 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
|
5862 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
|
5863 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
|
5864 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5865 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
|
5866 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
|
5867 if( cbp_b == 2 ) ctx += 2; |
2314 | 5868 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
|
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 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
|
5871 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
|
5872 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
|
5873 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
|
5874 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
|
5875 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5876 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
|
5877 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
|
5878 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5879 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
|
5880 |
3316 | 5881 if( h->last_qscale_diff != 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
|
5882 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5883 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5884 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
|
5885 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
|
5886 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
|
5887 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5888 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
|
5889 val++; |
3128 | 5890 if(val > 102) //prevent infinite loop |
2844
5f20ab245501
prevent assert failures and infinite loops with broken streams
michael
parents:
2834
diff
changeset
|
5891 return INT_MIN; |
1908
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( 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
|
5895 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
|
5896 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5897 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
|
5898 } |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5899 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
|
5900 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
|
5901 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
|
5902 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
|
5903 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
|
5904 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
|
5905 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
|
5906 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
|
5907 } |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5908 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
|
5909 int type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5910 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
|
5911 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
|
5912 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
|
5913 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
|
5914 type = 3; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5915 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
|
5916 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
|
5917 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
|
5918 type += 4; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5919 } |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5920 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
|
5921 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
|
5922 return type; |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5923 } |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5924 |
2755 | 5925 static inline int decode_cabac_mb_transform_size( H264Context *h ) { |
5926 return get_cabac( &h->cabac, &h->cabac_state[399 + h->neighbor_transform_size] ); | |
5927 } | |
5928 | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5929 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
|
5930 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
|
5931 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
|
5932 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
|
5933 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
|
5934 |
2396 | 5935 if( h->slice_type == B_TYPE) { |
5936 if( refa > 0 && !h->direct_cache[scan8[n] - 1] ) | |
5937 ctx++; | |
5938 if( refb > 0 && !h->direct_cache[scan8[n] - 8] ) | |
5939 ctx += 2; | |
5940 } else { | |
5941 if( refa > 0 ) | |
5942 ctx++; | |
5943 if( refb > 0 ) | |
5944 ctx += 2; | |
5945 } | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5946 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5947 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
|
5948 ref++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5949 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
|
5950 ctx = 4; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5951 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5952 ctx = 5; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5953 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5954 return ref; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5955 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5956 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5957 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
|
5958 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
|
5959 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
|
5960 int ctxbase = (l == 0) ? 40 : 47; |
2317 | 5961 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
|
5962 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5963 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
|
5964 ctx = 0; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5965 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
|
5966 ctx = 2; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5967 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5968 ctx = 1; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5969 |
2317 | 5970 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx])) |
5971 return 0; | |
5972 | |
5973 mvd= 1; | |
5974 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
|
5975 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
|
5976 mvd++; |
2317 | 5977 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
|
5978 ctx++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5979 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5980 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5981 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
|
5982 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
|
5983 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
|
5984 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
|
5985 k++; |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5986 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5987 while( k-- ) { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5988 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
|
5989 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
|
5990 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5991 } |
2317 | 5992 if( get_cabac_bypass( &h->cabac ) ) return -mvd; |
5993 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
|
5994 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5995 |
2316 | 5996 static int inline get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { |
2314 | 5997 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
|
5998 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
|
5999 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6000 if( cat == 0 ) { |
2314 | 6001 nza = h->left_cbp&0x100; |
6002 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
|
6003 } else if( cat == 1 || cat == 2 ) { |
2314 | 6004 nza = h->non_zero_count_cache[scan8[idx] - 1]; |
6005 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
|
6006 } else if( cat == 3 ) { |
2314 | 6007 nza = (h->left_cbp>>(6+idx))&0x01; |
6008 nzb = (h-> top_cbp>>(6+idx))&0x01; | |
6009 } else { | |
6010 assert(cat == 4); | |
6011 nza = h->non_zero_count_cache[scan8[16+idx] - 1]; | |
6012 nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; | |
6013 } | |
6014 | |
6015 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
|
6016 ctx++; |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6017 |
2314 | 6018 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
|
6019 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
|
6020 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6021 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
|
6022 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6023 |
3028 | 6024 static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, 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
|
6025 const int mb_xy = h->s.mb_x + h->s.mb_y*h->s.mb_stride; |
3316 | 6026 static const int significant_coeff_flag_offset[2][6] = { |
6027 { 105+0, 105+15, 105+29, 105+44, 105+47, 402 }, | |
6028 { 277+0, 277+15, 277+29, 277+44, 277+47, 436 } | |
6029 }; | |
6030 static const int last_coeff_flag_offset[2][6] = { | |
6031 { 166+0, 166+15, 166+29, 166+44, 166+47, 417 }, | |
6032 { 338+0, 338+15, 338+29, 338+44, 338+47, 451 } | |
6033 }; | |
6034 static const int coeff_abs_level_m1_offset[6] = { | |
6035 227+0, 227+10, 227+20, 227+30, 227+39, 426 | |
6036 }; | |
6037 static const int significant_coeff_flag_offset_8x8[2][63] = { | |
6038 { 0, 1, 2, 3, 4, 5, 5, 4, 4, 3, 3, 4, 4, 4, 5, 5, | |
2755 | 6039 4, 4, 4, 4, 3, 3, 6, 7, 7, 7, 8, 9,10, 9, 8, 7, |
6040 7, 6,11,12,13,11, 6, 7, 8, 9,14,10, 9, 8, 6,11, | |
3316 | 6041 12,13,11, 6, 9,14,10, 9,11,12,13,11,14,10,12 }, |
6042 { 0, 1, 1, 2, 2, 3, 3, 4, 5, 6, 7, 7, 7, 8, 4, 5, | |
6043 6, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,11,12,11, | |
6044 9, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,13,13, 9, | |
6045 9,10,10, 8,13,13, 9, 9,10,10,14,14,14,14,14 } | |
2755 | 6046 }; |
6047 static const int last_coeff_flag_offset_8x8[63] = { | |
6048 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | |
6049 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | |
6050 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, | |
6051 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8 | |
6052 }; | |
6053 | |
6054 int index[64]; | |
2313 | 6055 |
6056 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
|
6057 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
|
6058 |
2316 | 6059 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
|
6060 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
|
6061 |
2898 | 6062 uint8_t *significant_coeff_ctx_base; |
6063 uint8_t *last_coeff_ctx_base; | |
6064 uint8_t *abs_level_m1_ctx_base; | |
2755 | 6065 |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6066 /* 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
|
6067 * 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
|
6068 * 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
|
6069 * 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
|
6070 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx |
2755 | 6071 * 5-> Luma8x8 n = 4 * luma8x8idx |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6072 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6073 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6074 /* read coded block flag */ |
2898 | 6075 if( cat != 5 ) { |
2755 | 6076 if( get_cabac( &h->cabac, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n ) ] ) == 0 ) { |
6077 if( cat == 1 || cat == 2 ) | |
6078 h->non_zero_count_cache[scan8[n]] = 0; | |
6079 else if( cat == 4 ) | |
6080 h->non_zero_count_cache[scan8[16+n]] = 0; | |
6081 | |
6082 return 0; | |
6083 } | |
2898 | 6084 } |
6085 | |
6086 significant_coeff_ctx_base = h->cabac_state | |
3316 | 6087 + significant_coeff_flag_offset[MB_FIELD][cat]; |
2898 | 6088 last_coeff_ctx_base = h->cabac_state |
3316 | 6089 + last_coeff_flag_offset[MB_FIELD][cat]; |
2898 | 6090 abs_level_m1_ctx_base = h->cabac_state |
6091 + coeff_abs_level_m1_offset[cat]; | |
6092 | |
6093 if( cat == 5 ) { | |
6094 #define DECODE_SIGNIFICANCE( coefs, sig_off, last_off ) \ | |
6095 for(last= 0; last < coefs; last++) { \ | |
6096 uint8_t *sig_ctx = significant_coeff_ctx_base + sig_off; \ | |
6097 if( get_cabac( &h->cabac, sig_ctx )) { \ | |
6098 uint8_t *last_ctx = last_coeff_ctx_base + last_off; \ | |
6099 index[coeff_count++] = last; \ | |
6100 if( get_cabac( &h->cabac, last_ctx ) ) { \ | |
6101 last= max_coeff; \ | |
6102 break; \ | |
6103 } \ | |
6104 } \ | |
6105 } | |
3316 | 6106 const int *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD]; |
6107 DECODE_SIGNIFICANCE( 63, sig_off[last], last_coeff_flag_offset_8x8[last] ); | |
2898 | 6108 } else { |
6109 DECODE_SIGNIFICANCE( max_coeff - 1, last, 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
|
6110 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6111 if( last == max_coeff -1 ) { |
2313 | 6112 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
|
6113 } |
2316 | 6114 assert(coeff_count > 0); |
6115 | |
6116 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
|
6117 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
|
6118 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
|
6119 h->non_zero_count_cache[scan8[n]] = coeff_count; |
2316 | 6120 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
|
6121 h->cbp_table[mb_xy] |= 0x40 << n; |
2755 | 6122 else if( cat == 4 ) |
6123 h->non_zero_count_cache[scan8[16+n]] = coeff_count; | |
2316 | 6124 else { |
2755 | 6125 assert( cat == 5 ); |
3105
2d35fb3cb940
h264: special case dc-only idct. ~1% faster overall
lorenm
parents:
3101
diff
changeset
|
6126 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1); |
2316 | 6127 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6128 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6129 for( i = coeff_count - 1; i >= 0; i-- ) { |
2898 | 6130 uint8_t *ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + abs_level_m1_ctx_base; |
2316 | 6131 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
|
6132 |
2898 | 6133 if( get_cabac( &h->cabac, ctx ) == 0 ) { |
6134 if( !qmul ) { | |
2316 | 6135 if( get_cabac_bypass( &h->cabac ) ) block[j] = -1; |
6136 else block[j] = 1; | |
6137 }else{ | |
2919 | 6138 if( get_cabac_bypass( &h->cabac ) ) block[j] = (-qmul[j] + 32) >> 6; |
6139 else block[j] = ( qmul[j] + 32) >> 6; | |
2316 | 6140 } |
2967 | 6141 |
2313 | 6142 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
|
6143 } else { |
2313 | 6144 int coeff_abs = 2; |
2898 | 6145 ctx = 5 + FFMIN( 4, abslevelgt1 ) + abs_level_m1_ctx_base; |
6146 while( coeff_abs < 15 && get_cabac( &h->cabac, ctx ) ) { | |
2313 | 6147 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
|
6148 } |
2313 | 6149 |
6150 if( coeff_abs >= 15 ) { | |
6151 int j = 0; | |
6152 while( get_cabac_bypass( &h->cabac ) ) { | |
6153 coeff_abs += 1 << j; | |
6154 j++; | |
6155 } | |
2967 | 6156 |
2313 | 6157 while( j-- ) { |
6158 if( get_cabac_bypass( &h->cabac ) ) | |
6159 coeff_abs += 1 << j ; | |
6160 } | |
6161 } | |
6162 | |
2898 | 6163 if( !qmul ) { |
2316 | 6164 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs; |
6165 else block[j] = coeff_abs; | |
6166 }else{ | |
2919 | 6167 if( get_cabac_bypass( &h->cabac ) ) block[j] = (-coeff_abs * qmul[j] + 32) >> 6; |
6168 else block[j] = ( coeff_abs * qmul[j] + 32) >> 6; | |
2316 | 6169 } |
2967 | 6170 |
2313 | 6171 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
|
6172 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6173 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6174 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
|
6175 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6176 |
3077 | 6177 static void inline compute_mb_neighbors(H264Context *h) |
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6178 { |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6179 MpegEncContext * const s = &h->s; |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6180 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6181 h->top_mb_xy = mb_xy - s->mb_stride; |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6182 h->left_mb_xy[0] = mb_xy - 1; |
3316 | 6183 if(FRAME_MBAFF){ |
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6184 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride; |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6185 const int top_pair_xy = pair_xy - s->mb_stride; |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6186 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]); |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6187 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]); |
3316 | 6188 const int curr_mb_frame_flag = !MB_FIELD; |
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6189 const int bottom = (s->mb_y & 1); |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6190 if (bottom |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6191 ? !curr_mb_frame_flag // bottom macroblock |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6192 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6193 ) { |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6194 h->top_mb_xy -= s->mb_stride; |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6195 } |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6196 if (left_mb_frame_flag != curr_mb_frame_flag) { |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6197 h->left_mb_xy[0] = pair_xy - 1; |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6198 } |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6199 } |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6200 return; |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6201 } |
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
6202 |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6203 /** |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6204 * 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
|
6205 * @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
|
6206 */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6207 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
|
6208 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
|
6209 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
|
6210 int mb_type, partition_count, cbp = 0; |
2755 | 6211 int dct8x8_allowed= h->pps.transform_8x8_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
|
6212 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6213 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong?) |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6214 |
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
|
6215 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
|
6216 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE ) { |
3316 | 6217 int skip; |
6218 /* a skipped mb needs the aff flag from the following mb */ | |
6219 if( FRAME_MBAFF && s->mb_x==0 && (s->mb_y&1)==0 ) | |
6220 predict_field_decoding_flag(h); | |
6221 if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped ) | |
6222 skip = h->next_mb_skipped; | |
6223 else | |
6224 skip = decode_cabac_mb_skip( h, 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
|
6225 /* read skip flags */ |
3316 | 6226 if( skip ) { |
6227 if( FRAME_MBAFF && (s->mb_y&1)==0 ){ | |
6228 s->current_picture.mb_type[mb_xy] = MB_TYPE_SKIP; | |
6229 h->next_mb_skipped = decode_cabac_mb_skip( h, s->mb_x, s->mb_y+1 ); | |
6230 if(h->next_mb_skipped) | |
6231 predict_field_decoding_flag(h); | |
6232 else | |
6233 h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); | |
6234 } | |
6235 | |
2396 | 6236 decode_mb_skip(h); |
6237 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6238 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
|
6239 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
|
6240 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
|
6241 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6242 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
|
6243 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6244 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6245 } |
3316 | 6246 if(FRAME_MBAFF){ |
6247 if( (s->mb_y&1) == 0 ) | |
6248 h->mb_mbaff = | |
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
6249 h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
6250 }else |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
6251 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); |
5357b214eda0
CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
6252 |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
6253 h->prev_mb_skipped = 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
|
6254 |
3077 | 6255 compute_mb_neighbors(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
|
6256 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
|
6257 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
|
6258 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
|
6259 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6260 |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6261 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
|
6262 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
|
6263 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
|
6264 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
|
6265 }else{ |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6266 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
|
6267 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
|
6268 } |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6269 } 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
|
6270 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
|
6271 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
|
6272 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
|
6273 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6274 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
|
6275 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
|
6276 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6277 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6278 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
|
6279 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
|
6280 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
|
6281 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
|
6282 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
|
6283 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
|
6284 } |
3316 | 6285 if(MB_FIELD) |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6286 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
|
6287 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6288 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
|
6289 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6290 if(IS_INTRA_PCM(mb_type)) { |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6291 const uint8_t *ptr; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6292 unsigned int x, y; |
2967 | 6293 |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6294 // 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
|
6295 // 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
|
6296 // 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
|
6297 ptr= h->cabac.bytestream; |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6298 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
|
6299 |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6300 // 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
|
6301 for(y=0; y<16; y++){ |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6302 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
|
6303 for(x=0; x<16; x++){ |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6304 tprintf("LUMA ICPM LEVEL (%3d)\n", *ptr); |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6305 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
|
6306 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6307 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6308 for(y=0; y<8; y++){ |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6309 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
|
6310 for(x=0; x<8; x++){ |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6311 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
|
6312 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
|
6313 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6314 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6315 for(y=0; y<8; y++){ |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6316 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
|
6317 for(x=0; x<8; x++){ |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6318 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
|
6319 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
|
6320 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6321 } |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6322 |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6323 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
|
6324 |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6325 // All blocks are present |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6326 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
|
6327 h->chroma_pred_mode_table[mb_xy] = 0; |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6328 // In deblocking, the quantizer is 0 |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6329 s->current_picture.qscale_table[mb_xy]= 0; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6330 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, 0); |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6331 // All coeffs are present |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6332 memset(h->non_zero_count[mb_xy], 16, 16); |
2755 | 6333 s->current_picture.mb_type[mb_xy]= mb_type; |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6334 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
|
6335 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6336 |
3316 | 6337 if(MB_MBAFF){ |
6338 h->ref_count[0] <<= 1; | |
6339 h->ref_count[1] <<= 1; | |
6340 } | |
6341 | |
2449 | 6342 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
|
6343 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6344 if( IS_INTRA( mb_type ) ) { |
2755 | 6345 int 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
|
6346 if( IS_INTRA4x4( mb_type ) ) { |
2755 | 6347 if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) { |
6348 mb_type |= MB_TYPE_8x8DCT; | |
6349 for( i = 0; i < 16; i+=4 ) { | |
6350 int pred = pred_intra_mode( h, i ); | |
6351 int mode = decode_cabac_mb_intra4x4_pred_mode( h, pred ); | |
6352 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 ); | |
6353 } | |
6354 } else { | |
6355 for( i = 0; i < 16; i++ ) { | |
6356 int pred = pred_intra_mode( h, i ); | |
6357 h->intra4x4_pred_mode_cache[ scan8[i] ] = decode_cabac_mb_intra4x4_pred_mode( h, pred ); | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6358 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6359 //av_log( s->avctx, AV_LOG_ERROR, "i4x4 pred=%d mode=%d\n", pred, h->intra4x4_pred_mode_cache[ scan8[i] ] ); |
2755 | 6360 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6361 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6362 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
|
6363 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
|
6364 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6365 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
|
6366 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
|
6367 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6368 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
|
6369 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
|
6370 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6371 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
|
6372 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
|
6373 } 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
|
6374 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
|
6375 |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6376 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
|
6377 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
|
6378 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
|
6379 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
|
6380 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
|
6381 } |
3482 | 6382 if( IS_DIRECT(h->sub_mb_type[0] | h->sub_mb_type[1] | |
6383 h->sub_mb_type[2] | h->sub_mb_type[3]) ) { | |
2396 | 6384 pred_direct_motion(h, &mb_type); |
6385 if( h->ref_count[0] > 1 || h->ref_count[1] > 1 ) { | |
6386 for( i = 0; i < 4; i++ ) | |
6387 if( IS_DIRECT(h->sub_mb_type[i]) ) | |
6388 fill_rectangle( &h->direct_cache[scan8[4*i]], 2, 2, 8, 1, 1 ); | |
6389 } | |
6390 } | |
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6391 } else { |
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
6392 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
|
6393 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
|
6394 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
|
6395 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
|
6396 } |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6397 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6398 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6399 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
|
6400 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
|
6401 for( i = 0; i < 4; i++ ) { |
2396 | 6402 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
6403 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
|
6404 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
|
6405 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
|
6406 else |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6407 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
|
6408 } else { |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6409 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
|
6410 } |
2110 | 6411 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
|
6412 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
|
6413 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6414 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6415 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6416 |
2755 | 6417 if(dct8x8_allowed) |
6418 dct8x8_allowed = get_dct8x8_allowed(h); | |
6419 | |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6420 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
|
6421 for(i=0; i<4; i++){ |
2396 | 6422 if(IS_DIRECT(h->sub_mb_type[i])){ |
6423 fill_rectangle(h->mvd_cache[list][scan8[4*i]], 2, 2, 8, 0, 4); | |
6424 continue; | |
6425 } | |
2110 | 6426 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
|
6427 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6428 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
|
6429 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
|
6430 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
|
6431 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
|
6432 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
|
6433 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
|
6434 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
|
6435 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
|
6436 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
|
6437 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
|
6438 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6439 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
|
6440 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
|
6441 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
|
6442 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6443 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
|
6444 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
|
6445 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
|
6446 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
|
6447 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
|
6448 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6449 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
|
6450 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
|
6451 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
|
6452 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
|
6453 }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
|
6454 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
|
6455 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
|
6456 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6457 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
|
6458 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
|
6459 }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
|
6460 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
|
6461 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
|
6462 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6463 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
|
6464 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
|
6465 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6466 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
|
6467 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
|
6468 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
|
6469 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6470 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
|
6471 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
|
6472 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6473 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6474 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6475 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
|
6476 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
|
6477 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
|
6478 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
|
6479 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6480 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6481 } |
2396 | 6482 } else if( IS_DIRECT(mb_type) ) { |
6483 pred_direct_motion(h, &mb_type); | |
6484 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
6485 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
2755 | 6486 dct8x8_allowed &= h->sps.direct_8x8_inference_flag; |
2396 | 6487 } else { |
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6488 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
|
6489 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
|
6490 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
|
6491 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
|
6492 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
|
6493 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
|
6494 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
|
6495 } |
2523 | 6496 }else |
6497 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
|
6498 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6499 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
|
6500 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
|
6501 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
|
6502 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6503 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
|
6504 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
|
6505 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
|
6506 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6507 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
|
6508 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
2523 | 6509 }else |
6510 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
|
6511 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6512 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6513 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
|
6514 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
|
6515 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
|
6516 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
|
6517 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
|
6518 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
|
6519 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, ref, 1); |
2396 | 6520 }else |
6521 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
|
6522 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6523 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6524 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6525 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
|
6526 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
|
6527 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
|
6528 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
|
6529 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
|
6530 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
|
6531 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
|
6532 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6533 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
|
6534 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
2523 | 6535 }else{ |
2396 | 6536 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); |
6537 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
|
6538 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6539 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6540 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6541 }else{ |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6542 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
|
6543 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
|
6544 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
|
6545 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
|
6546 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
|
6547 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
|
6548 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, ref, 1); |
2396 | 6549 }else |
6550 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
|
6551 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6552 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6553 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6554 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
|
6555 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
|
6556 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
|
6557 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
|
6558 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
|
6559 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
|
6560 |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6561 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
|
6562 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
|
6563 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
2523 | 6564 }else{ |
2396 | 6565 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); |
6566 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
|
6567 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6568 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6569 } |
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
6570 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6571 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6572 |
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
|
6573 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
|
6574 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
|
6575 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
|
6576 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6577 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6578 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
|
6579 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
|
6580 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
|
6581 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6582 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6583 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
|
6584 |
2755 | 6585 if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) { |
6586 if( decode_cabac_mb_transform_size( h ) ) | |
6587 mb_type |= MB_TYPE_8x8DCT; | |
6588 } | |
6589 s->current_picture.mb_type[mb_xy]= mb_type; | |
6590 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6591 if( cbp || IS_INTRA16x16( mb_type ) ) { |
3174 | 6592 const uint8_t *scan, *scan8x8, *dc_scan; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6593 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
|
6594 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6595 if(IS_INTERLACED(mb_type)){ |
3316 | 6596 scan8x8= s->qscale ? h->field_scan8x8 : h->field_scan8x8_q0; |
2763 | 6597 scan= s->qscale ? h->field_scan : h->field_scan_q0; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6598 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
|
6599 }else{ |
3316 | 6600 scan8x8= s->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0; |
2763 | 6601 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0; |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6602 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
|
6603 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6604 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6605 h->last_qscale_diff = dqp = decode_cabac_mb_dqp( h ); |
2883
a95e55679dfa
check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents:
2867
diff
changeset
|
6606 if( dqp == INT_MIN ){ |
a95e55679dfa
check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents:
2867
diff
changeset
|
6607 av_log(h->s.avctx, AV_LOG_ERROR, "cabac decode of qscale diff failed at %d %d\n", s->mb_x, s->mb_y); |
a95e55679dfa
check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents:
2867
diff
changeset
|
6608 return -1; |
a95e55679dfa
check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents:
2867
diff
changeset
|
6609 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6610 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
|
6611 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
|
6612 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
|
6613 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
|
6614 } |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6615 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6616 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6617 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
|
6618 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
|
6619 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" ); |
2898 | 6620 if( decode_cabac_residual( h, h->mb, 0, 0, dc_scan, NULL, 16) < 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
|
6621 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
|
6622 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
|
6623 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
|
6624 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i ); |
2919 | 6625 if( decode_cabac_residual(h, h->mb + 16*i, 1, i, scan + 1, h->dequant4_coeff[0][s->qscale], 15) < 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
|
6626 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
|
6627 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6628 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6629 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
|
6630 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6631 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6632 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
|
6633 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
|
6634 if( cbp & (1<<i8x8) ) { |
2755 | 6635 if( IS_8x8DCT(mb_type) ) { |
6636 if( decode_cabac_residual(h, h->mb + 64*i8x8, 5, 4*i8x8, | |
3174 | 6637 scan8x8, h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 64) < 0 ) |
2755 | 6638 return -1; |
6639 } 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
|
6640 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
|
6641 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
|
6642 //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index ); |
2919 | 6643 if( decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale], 16) < 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
|
6644 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
|
6645 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6646 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6647 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
|
6648 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
|
6649 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6650 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6651 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6652 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6653 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
|
6654 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
|
6655 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
|
6656 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c ); |
2898 | 6657 if( decode_cabac_residual(h, h->mb + 256 + 16*4*c, 3, c, chroma_dc_scan, NULL, 4) < 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
|
6658 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
|
6659 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6660 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6661 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6662 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
|
6663 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
|
6664 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
|
6665 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
|
6666 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
|
6667 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 ); |
2919 | 6668 if( decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, h->dequant4_coeff[c+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp], 15) < 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
|
6669 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
|
6670 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6671 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6672 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6673 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
|
6674 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
|
6675 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
|
6676 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6677 } else { |
2315 | 6678 uint8_t * const nnz= &h->non_zero_count_cache[0]; |
6679 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1); | |
6680 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
6681 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
3316 | 6682 h->last_qscale_diff = 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
|
6683 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6684 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6685 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
|
6686 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
|
6687 |
3316 | 6688 if(MB_MBAFF){ |
6689 h->ref_count[0] >>= 1; | |
6690 h->ref_count[1] >>= 1; | |
6691 } | |
6692 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6693 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
|
6694 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6695 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6696 |
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
|
6697 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
|
6698 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
|
6699 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
|
6700 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
|
6701 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
|
6702 |
2633 | 6703 if( bS[0] < 4 ) { |
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6704 int8_t tc[4]; |
2633 | 6705 for(i=0; i<4; i++) |
6706 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] : -1; | |
6707 h->s.dsp.h264_h_loop_filter_luma(pix, stride, alpha, beta, tc); | |
6708 } else { | |
6709 /* 16px edge length, because bS=4 is triggered by being at | |
6710 * the edge of an intra MB, so all 4 bS are the same */ | |
6711 for( d = 0; d < 16; d++ ) { | |
1898 | 6712 const int p0 = pix[-1]; |
6713 const int p1 = pix[-2]; | |
6714 const int p2 = pix[-3]; | |
6715 | |
6716 const int q0 = pix[0]; | |
6717 const int q1 = pix[1]; | |
6718 const int q2 = pix[2]; | |
6719 | |
6720 if( ABS( p0 - q0 ) < alpha && | |
6721 ABS( p1 - p0 ) < beta && | |
6722 ABS( q1 - q0 ) < beta ) { | |
6723 | |
6724 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
6725 if( ABS( p2 - p0 ) < beta) | |
6726 { | |
6727 const int p3 = pix[-4]; | |
6728 /* p0', p1', p2' */ | |
6729 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
6730 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
6731 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
6732 } else { | |
6733 /* p0' */ | |
6734 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
6735 } | |
6736 if( ABS( q2 - q0 ) < beta) | |
6737 { | |
6738 const int q3 = pix[3]; | |
6739 /* q0', q1', q2' */ | |
6740 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
6741 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
6742 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
6743 } else { | |
6744 /* q0' */ | |
6745 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
6746 } | |
6747 }else{ | |
6748 /* p0', q0' */ | |
6749 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
6750 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
6751 } | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6752 tprintf("filter_mb_edgev i:%d d:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, p2, p1, p0, q0, q1, q2, pix[-2], pix[-1], pix[0], pix[1]); |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6753 } |
1898 | 6754 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
|
6755 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6756 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6757 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6758 static void filter_mb_edgecv( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) { |
2834 | 6759 int i; |
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
|
6760 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
|
6761 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
|
6762 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
|
6763 |
2633 | 6764 if( bS[0] < 4 ) { |
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6765 int8_t tc[4]; |
2633 | 6766 for(i=0; i<4; i++) |
6767 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] + 1 : 0; | |
6768 h->s.dsp.h264_h_loop_filter_chroma(pix, stride, alpha, beta, tc); | |
6769 } else { | |
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6770 h->s.dsp.h264_h_loop_filter_chroma_intra(pix, stride, alpha, beta); |
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
|
6771 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6772 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6773 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6774 static void filter_mb_mbaff_edgev( H264Context *h, uint8_t *pix, int stride, int bS[8], int qp[2] ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6775 int i; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6776 for( i = 0; i < 16; i++, pix += stride) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6777 int index_a; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6778 int alpha; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6779 int beta; |
2967 | 6780 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6781 int qp_index; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6782 int bS_index = (i >> 1); |
3316 | 6783 if (!MB_FIELD) { |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6784 bS_index &= ~1; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6785 bS_index |= (i & 1); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6786 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6787 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6788 if( bS[bS_index] == 0 ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6789 continue; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6790 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6791 |
3316 | 6792 qp_index = MB_FIELD ? (i >> 3) : (i & 1); |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6793 index_a = clip( qp[qp_index] + h->slice_alpha_c0_offset, 0, 51 ); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6794 alpha = alpha_table[index_a]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6795 beta = beta_table[clip( qp[qp_index] + h->slice_beta_offset, 0, 51 )]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6796 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6797 if( bS[bS_index] < 4 ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6798 const int tc0 = tc0_table[index_a][bS[bS_index] - 1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6799 const int p0 = pix[-1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6800 const int p1 = pix[-2]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6801 const int p2 = pix[-3]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6802 const int q0 = pix[0]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6803 const int q1 = pix[1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6804 const int q2 = pix[2]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6805 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6806 if( ABS( p0 - q0 ) < alpha && |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6807 ABS( p1 - p0 ) < beta && |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6808 ABS( q1 - q0 ) < beta ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6809 int tc = tc0; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6810 int i_delta; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6811 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6812 if( ABS( p2 - p0 ) < beta ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6813 pix[-2] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6814 tc++; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6815 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6816 if( ABS( q2 - q0 ) < beta ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6817 pix[1] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6818 tc++; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6819 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6820 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6821 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6822 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6823 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6824 tprintf("filter_mb_mbaff_edgev i:%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, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6825 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6826 }else{ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6827 const int p0 = pix[-1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6828 const int p1 = pix[-2]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6829 const int p2 = pix[-3]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6830 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6831 const int q0 = pix[0]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6832 const int q1 = pix[1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6833 const int q2 = pix[2]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6834 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6835 if( ABS( p0 - q0 ) < alpha && |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6836 ABS( p1 - p0 ) < beta && |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6837 ABS( q1 - q0 ) < beta ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6838 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6839 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6840 if( ABS( p2 - p0 ) < beta) |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6841 { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6842 const int p3 = pix[-4]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6843 /* p0', p1', p2' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6844 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6845 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6846 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6847 } else { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6848 /* p0' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6849 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6850 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6851 if( ABS( q2 - q0 ) < beta) |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6852 { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6853 const int q3 = pix[3]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6854 /* q0', q1', q2' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6855 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6856 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6857 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6858 } else { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6859 /* q0' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6860 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6861 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6862 }else{ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6863 /* p0', q0' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6864 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6865 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6866 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6867 tprintf("filter_mb_mbaff_edgev i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, p2, p1, p0, q0, q1, q2, pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6868 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6869 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6870 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6871 } |
3316 | 6872 static void filter_mb_mbaff_edgecv( H264Context *h, uint8_t *pix, int stride, int bS[8], int qp[2] ) { |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6873 int i; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6874 for( i = 0; i < 8; i++, pix += stride) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6875 int index_a; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6876 int alpha; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6877 int beta; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6878 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6879 int qp_index; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6880 int bS_index = i; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6881 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6882 if( bS[bS_index] == 0 ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6883 continue; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6884 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6885 |
3316 | 6886 qp_index = MB_FIELD ? (i >> 2) : (i & 1); |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6887 index_a = clip( qp[qp_index] + h->slice_alpha_c0_offset, 0, 51 ); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6888 alpha = alpha_table[index_a]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6889 beta = beta_table[clip( qp[qp_index] + h->slice_beta_offset, 0, 51 )]; |
3316 | 6890 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6891 if( bS[bS_index] < 4 ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6892 const int tc = tc0_table[index_a][bS[bS_index] - 1] + 1; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6893 const int p0 = pix[-1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6894 const int p1 = pix[-2]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6895 const int q0 = pix[0]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6896 const int q1 = pix[1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6897 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6898 if( ABS( p0 - q0 ) < alpha && |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6899 ABS( p1 - p0 ) < beta && |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6900 ABS( q1 - q0 ) < beta ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6901 const int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6902 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6903 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6904 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6905 tprintf("filter_mb_mbaff_edgecv i:%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, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6906 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6907 }else{ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6908 const int p0 = pix[-1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6909 const int p1 = pix[-2]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6910 const int q0 = pix[0]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6911 const int q1 = pix[1]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6912 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6913 if( ABS( p0 - q0 ) < alpha && |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6914 ABS( p1 - p0 ) < beta && |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6915 ABS( q1 - q0 ) < beta ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6916 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6917 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6918 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6919 tprintf("filter_mb_mbaff_edgecv i:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, pix[-3], p1, p0, q0, q1, pix[2], pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6920 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6921 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6922 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6923 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6924 |
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
|
6925 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
|
6926 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
|
6927 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
|
6928 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
|
6929 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
|
6930 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
|
6931 |
2633 | 6932 if( bS[0] < 4 ) { |
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6933 int8_t tc[4]; |
2633 | 6934 for(i=0; i<4; i++) |
6935 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] : -1; | |
6936 h->s.dsp.h264_v_loop_filter_luma(pix, stride, alpha, beta, tc); | |
6937 } else { | |
6938 /* 16px edge length, see filter_mb_edgev */ | |
6939 for( d = 0; d < 16; d++ ) { | |
1898 | 6940 const int p0 = pix[-1*pix_next]; |
6941 const int p1 = pix[-2*pix_next]; | |
6942 const int p2 = pix[-3*pix_next]; | |
6943 const int q0 = pix[0]; | |
6944 const int q1 = pix[1*pix_next]; | |
6945 const int q2 = pix[2*pix_next]; | |
6946 | |
6947 if( ABS( p0 - q0 ) < alpha && | |
6948 ABS( p1 - p0 ) < beta && | |
6949 ABS( q1 - q0 ) < beta ) { | |
6950 | |
6951 const int p3 = pix[-4*pix_next]; | |
6952 const int q3 = pix[ 3*pix_next]; | |
6953 | |
6954 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
6955 if( ABS( p2 - p0 ) < beta) { | |
6956 /* p0', p1', p2' */ | |
6957 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
6958 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
6959 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
6960 } else { | |
6961 /* p0' */ | |
6962 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
6963 } | |
6964 if( ABS( q2 - q0 ) < beta) { | |
6965 /* q0', q1', q2' */ | |
6966 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
6967 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
6968 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
6969 } else { | |
6970 /* q0' */ | |
6971 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
6972 } | |
6973 }else{ | |
6974 /* p0', q0' */ | |
6975 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
6976 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
6977 } | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6978 tprintf("filter_mb_edgeh i:%d d:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, qp, index_a, alpha, beta, bS[i], p2, p1, p0, q0, q1, q2, pix[-2*pix_next], pix[-pix_next], pix[0], pix[pix_next]); |
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
|
6979 } |
1898 | 6980 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
|
6981 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6982 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6983 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6984 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6985 static void filter_mb_edgech( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) { |
2834 | 6986 int i; |
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
|
6987 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
|
6988 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
|
6989 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
|
6990 |
2633 | 6991 if( bS[0] < 4 ) { |
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6992 int8_t tc[4]; |
2633 | 6993 for(i=0; i<4; i++) |
6994 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] + 1 : 0; | |
6995 h->s.dsp.h264_v_loop_filter_chroma(pix, stride, alpha, beta, tc); | |
6996 } else { | |
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6997 h->s.dsp.h264_v_loop_filter_chroma_intra(pix, stride, alpha, beta); |
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
|
6998 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6999 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7000 |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7001 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize) { |
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
|
7002 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
|
7003 const int mb_xy= mb_x + mb_y*s->mb_stride; |
3316 | 7004 const int mb_type = s->current_picture.mb_type[mb_xy]; |
7005 const int mvy_limit = IS_INTERLACED(mb_type) ? 2 : 4; | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7006 int first_vertical_edge_done = 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
|
7007 int dir; |
2629
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
7008 /* FIXME: A given frame may occupy more than one position in |
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
7009 * the reference list. So ref2frm should be populated with |
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
7010 * frame numbers, not indices. */ |
3316 | 7011 static const int ref2frm[34] = {-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, |
7012 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31}; | |
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
|
7013 |
3101 | 7014 //for sufficiently low qp, filtering wouldn't do anything |
7015 //this is a conservative estimate: could also check beta_offset and more accurate chroma_qp | |
3316 | 7016 if(!FRAME_MBAFF){ |
3101 | 7017 int qp_thresh = 15 - h->slice_alpha_c0_offset - FFMAX(0, h->pps.chroma_qp_index_offset); |
7018 int qp = s->current_picture.qscale_table[mb_xy]; | |
7019 if(qp <= qp_thresh | |
7020 && (mb_x == 0 || ((qp + s->current_picture.qscale_table[mb_xy-1] + 1)>>1) <= qp_thresh) | |
7021 && (mb_y == 0 || ((qp + s->current_picture.qscale_table[h->top_mb_xy] + 1)>>1) <= qp_thresh)){ | |
7022 return; | |
7023 } | |
7024 } | |
7025 | |
3316 | 7026 if (FRAME_MBAFF |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7027 // left mb is in picture |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7028 && h->slice_table[mb_xy-1] != 255 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7029 // and current and left pair do not have the same interlaced type |
3316 | 7030 && (IS_INTERLACED(mb_type) != IS_INTERLACED(s->current_picture.mb_type[mb_xy-1])) |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7031 // and left mb is in the same slice if deblocking_filter == 2 |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7032 && (h->deblocking_filter!=2 || h->slice_table[mb_xy-1] == h->slice_table[mb_xy])) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7033 /* First vertical edge is different in MBAFF frames |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7034 * There are 8 different bS to compute and 2 different Qp |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7035 */ |
3316 | 7036 const int pair_xy = mb_x + (mb_y&~1)*s->mb_stride; |
7037 const int left_mb_xy[2] = { pair_xy-1, pair_xy-1+s->mb_stride }; | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7038 int bS[8]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7039 int qp[2]; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7040 int chroma_qp[2]; |
3316 | 7041 int mb_qp, mbn0_qp, mbn1_qp; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7042 int i; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7043 first_vertical_edge_done = 1; |
3316 | 7044 |
7045 if( IS_INTRA(mb_type) ) | |
7046 bS[0] = bS[1] = bS[2] = bS[3] = bS[4] = bS[5] = bS[6] = bS[7] = 4; | |
7047 else { | |
7048 for( i = 0; i < 8; i++ ) { | |
7049 int mbn_xy = MB_FIELD ? left_mb_xy[i>>2] : left_mb_xy[i&1]; | |
7050 | |
7051 if( IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) | |
7052 bS[i] = 4; | |
7053 else if( h->non_zero_count_cache[12+8*(i>>1)] != 0 || | |
7054 /* FIXME: with 8x8dct + cavlc, should check cbp instead of nnz */ | |
7055 h->non_zero_count[mbn_xy][MB_FIELD ? i&3 : (i>>2)+(mb_y&1)*2] ) | |
7056 bS[i] = 2; | |
7057 else | |
7058 bS[i] = 1; | |
7059 } | |
7060 } | |
7061 | |
7062 mb_qp = s->current_picture.qscale_table[mb_xy]; | |
7063 mbn0_qp = s->current_picture.qscale_table[left_mb_xy[0]]; | |
7064 mbn1_qp = s->current_picture.qscale_table[left_mb_xy[1]]; | |
7065 qp[0] = ( mb_qp + mbn0_qp + 1 ) >> 1; | |
7066 chroma_qp[0] = ( get_chroma_qp( h->pps.chroma_qp_index_offset, mb_qp ) + | |
7067 get_chroma_qp( h->pps.chroma_qp_index_offset, mbn0_qp ) + 1 ) >> 1; | |
7068 qp[1] = ( mb_qp + mbn1_qp + 1 ) >> 1; | |
7069 chroma_qp[1] = ( get_chroma_qp( h->pps.chroma_qp_index_offset, mb_qp ) + | |
7070 get_chroma_qp( h->pps.chroma_qp_index_offset, mbn1_qp ) + 1 ) >> 1; | |
7071 | |
7072 /* Filter edge */ | |
7073 tprintf("filter mb:%d/%d MBAFF, QPy:%d/%d, QPc:%d/%d ls:%d uvls:%d", mb_x, mb_y, qp[0], qp[1], chroma_qp[0], chroma_qp[1], linesize, uvlinesize); | |
7074 { int i; for (i = 0; i < 8; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); } | |
7075 filter_mb_mbaff_edgev ( h, &img_y [0], linesize, bS, qp ); | |
7076 filter_mb_mbaff_edgecv( h, &img_cb[0], uvlinesize, bS, chroma_qp ); | |
7077 filter_mb_mbaff_edgecv( h, &img_cr[0], uvlinesize, bS, chroma_qp ); | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7078 } |
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
|
7079 /* 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
|
7080 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
|
7081 { |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7082 int edge; |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7083 const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy; |
2924 | 7084 const int mbm_type = s->current_picture.mb_type[mbm_xy]; |
2454 | 7085 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0; |
7086 | |
3101 | 7087 const int edges = (mb_type & (MB_TYPE_16x16|MB_TYPE_SKIP)) |
7088 == (MB_TYPE_16x16|MB_TYPE_SKIP) ? 1 : 4; | |
2926 | 7089 // how often to recheck mv-based bS when iterating between edges |
7090 const int mask_edge = (mb_type & (MB_TYPE_16x16 | (MB_TYPE_16x8 << dir))) ? 3 : | |
7091 (mb_type & (MB_TYPE_8x16 >> dir)) ? 1 : 0; | |
7092 // how often to recheck mv-based bS when iterating along each edge | |
7093 const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)); | |
7094 | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7095 if (first_vertical_edge_done) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7096 start = 1; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7097 first_vertical_edge_done = 0; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7098 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7099 |
2454 | 7100 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
|
7101 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
|
7102 |
3316 | 7103 if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0) && start == 0 |
7104 && !IS_INTERLACED(mb_type) | |
7105 && IS_INTERLACED(mbm_type) | |
7106 ) { | |
7107 // This is a special case in the norm where the filtering must | |
7108 // be done twice (one each of the field) even if we are in a | |
7109 // frame macroblock. | |
7110 // | |
7111 static const int nnz_idx[4] = {4,5,6,3}; | |
7112 unsigned int tmp_linesize = 2 * linesize; | |
7113 unsigned int tmp_uvlinesize = 2 * uvlinesize; | |
7114 int mbn_xy = mb_xy - 2 * s->mb_stride; | |
7115 int qp, chroma_qp; | |
7116 int i, j; | |
7117 int bS[4]; | |
7118 | |
7119 for(j=0; j<2; j++, mbn_xy += s->mb_stride){ | |
7120 if( IS_INTRA(mb_type) || | |
7121 IS_INTRA(s->current_picture.mb_type[mbn_xy]) ) { | |
7122 bS[0] = bS[1] = bS[2] = bS[3] = 3; | |
7123 } else { | |
7124 const uint8_t *mbn_nnz = h->non_zero_count[mbn_xy]; | |
7125 for( i = 0; i < 4; i++ ) { | |
7126 if( h->non_zero_count_cache[scan8[0]+i] != 0 || | |
7127 mbn_nnz[nnz_idx[i]] != 0 ) | |
7128 bS[i] = 2; | |
7129 else | |
7130 bS[i] = 1; | |
7131 } | |
7132 } | |
7133 // Do not use s->qscale as luma quantizer because it has not the same | |
7134 // value in IPCM macroblocks. | |
7135 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1; | |
7136 tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize); | |
7137 { int i; for (i = 0; i < 4; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); } | |
7138 filter_mb_edgeh( h, &img_y[j*linesize], tmp_linesize, bS, qp ); | |
7139 chroma_qp = ( h->chroma_qp + | |
7140 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; | |
7141 filter_mb_edgech( h, &img_cb[j*uvlinesize], tmp_uvlinesize, bS, chroma_qp ); | |
7142 filter_mb_edgech( h, &img_cr[j*uvlinesize], tmp_uvlinesize, bS, chroma_qp ); | |
7143 } | |
7144 | |
7145 start = 1; | |
7146 } | |
7147 | |
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
|
7148 /* Calculate bS */ |
2924 | 7149 for( edge = start; edge < edges; edge++ ) { |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7150 /* mbn_xy: neighbor macroblock */ |
2924 | 7151 const int mbn_xy = edge > 0 ? mb_xy : mbm_xy; |
7152 const int mbn_type = s->current_picture.mb_type[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
|
7153 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
|
7154 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
|
7155 |
2924 | 7156 if( (edge&1) && IS_8x8DCT(mb_type) ) |
2755 | 7157 continue; |
7158 | |
2924 | 7159 if( IS_INTRA(mb_type) || |
7160 IS_INTRA(mbn_type) ) { | |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7161 int value; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7162 if (edge == 0) { |
2924 | 7163 if ( (!IS_INTERLACED(mb_type) && !IS_INTERLACED(mbm_type)) |
3316 | 7164 || ((FRAME_MBAFF || (s->picture_structure != PICT_FRAME)) && (dir == 0)) |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7165 ) { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7166 value = 4; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7167 } else { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7168 value = 3; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7169 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7170 } else { |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7171 value = 3; |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7172 } |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7173 bS[0] = bS[1] = bS[2] = bS[3] = value; |
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
|
7174 } else { |
2924 | 7175 int i, l; |
7176 int mv_done; | |
7177 | |
7178 if( edge & mask_edge ) { | |
7179 bS[0] = bS[1] = bS[2] = bS[3] = 0; | |
7180 mv_done = 1; | |
7181 } | |
3316 | 7182 else if( FRAME_MBAFF && IS_INTERLACED(mb_type ^ mbn_type)) { |
7183 bS[0] = bS[1] = bS[2] = bS[3] = 1; | |
7184 mv_done = 1; | |
7185 } | |
2924 | 7186 else if( mask_par0 && (edge || (mbn_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)))) ) { |
7187 int b_idx= 8 + 4 + edge * (dir ? 8:1); | |
7188 int bn_idx= b_idx - (dir ? 8:1); | |
7189 int v = 0; | |
7190 for( l = 0; !v && l < 1 + (h->slice_type == B_TYPE); l++ ) { | |
7191 v |= ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] || | |
7192 ABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || | |
3316 | 7193 ABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit; |
2924 | 7194 } |
7195 bS[0] = bS[1] = bS[2] = bS[3] = v; | |
7196 mv_done = 1; | |
7197 } | |
7198 else | |
7199 mv_done = 0; | |
7200 | |
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
|
7201 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
|
7202 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
|
7203 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
|
7204 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
|
7205 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
|
7206 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
7207 if( h->non_zero_count_cache[b_idx] != 0 || |
2449 | 7208 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
|
7209 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
|
7210 } |
2924 | 7211 else if(!mv_done) |
2523 | 7212 { |
7213 bS[i] = 0; | |
7214 for( l = 0; l < 1 + (h->slice_type == B_TYPE); l++ ) { | |
2629
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
7215 if( ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] || |
2523 | 7216 ABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || |
3316 | 7217 ABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit ) { |
2523 | 7218 bS[i] = 1; |
7219 break; | |
7220 } | |
7221 } | |
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
|
7222 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7223 } |
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
7224 |
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
7225 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
|
7226 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
|
7227 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7228 |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7229 /* Filter edge */ |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7230 // Do not use s->qscale as luma quantizer because it has not the same |
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
7231 // value in IPCM macroblocks. |
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
7232 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
|
7233 //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]); |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7234 tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize); |
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7235 { int i; for (i = 0; i < 4; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); } |
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
|
7236 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
|
7237 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp ); |
1898 | 7238 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
|
7239 int chroma_qp = ( h->chroma_qp + |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7240 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7241 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
|
7242 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
|
7243 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7244 } 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
|
7245 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp ); |
1898 | 7246 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
|
7247 int chroma_qp = ( h->chroma_qp + |
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
7248 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; |
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7249 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
|
7250 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
|
7251 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7252 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7253 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7254 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7255 } |
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
7256 |
1168 | 7257 static int decode_slice(H264Context *h){ |
7258 MpegEncContext * const s = &h->s; | |
7259 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; | |
7260 | |
7261 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
|
7262 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7263 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
|
7264 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
|
7265 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7266 /* realign */ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7267 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
|
7268 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7269 /* 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
|
7270 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
|
7271 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
|
7272 s->gb.buffer + get_bits_count(&s->gb)/8, |
2116 | 7273 ( 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
|
7274 /* calculate pre-state */ |
2755 | 7275 for( i= 0; i < 460; 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
|
7276 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
|
7277 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
|
7278 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
|
7279 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7280 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
|
7281 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7282 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
|
7283 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
|
7284 else |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7285 h->cabac_state[i] = 2 * ( pre - 64 ) + 1; |
1168 | 7286 } |
7287 | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7288 for(;;){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7289 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
|
7290 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
|
7291 |
2163 | 7292 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
|
7293 |
3316 | 7294 if( ret >= 0 && FRAME_MBAFF ) { //FIXME optimal? or let mb_decode decode 16x32 ? |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7295 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
|
7296 |
2163 | 7297 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
|
7298 |
2844
5f20ab245501
prevent assert failures and infinite loops with broken streams
michael
parents:
2834
diff
changeset
|
7299 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
|
7300 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
|
7301 } |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7302 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
|
7303 |
2116 | 7304 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 1) { |
3297
9ae9653d706c
decoders should (IMHO) not duplicate frames, the application can do this if it wants
michael
parents:
3291
diff
changeset
|
7305 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d, bytestream (%d)\n", s->mb_x, s->mb_y, h->cabac.bytestream_end - h->cabac.bytestream); |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7306 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
|
7307 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
|
7308 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7309 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7310 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
|
7311 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
|
7312 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
2392 | 7313 ++s->mb_y; |
3316 | 7314 if(FRAME_MBAFF) { |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7315 ++s->mb_y; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7316 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7317 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7318 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7319 if( eos || s->mb_y >= s->mb_height ) { |
2392 | 7320 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
|
7321 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
|
7322 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
|
7323 } |
1168 | 7324 } |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7325 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7326 } else { |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7327 for(;;){ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7328 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
|
7329 |
2163 | 7330 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
|
7331 |
3316 | 7332 if(ret>=0 && FRAME_MBAFF){ //FIXME optimal? or let mb_decode decode 16x32 ? |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7333 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
|
7334 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
|
7335 |
2163 | 7336 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
|
7337 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
|
7338 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7339 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7340 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
|
7341 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
|
7342 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
|
7343 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7344 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
|
7345 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7346 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7347 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
|
7348 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
|
7349 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
|
7350 ++s->mb_y; |
3316 | 7351 if(FRAME_MBAFF) { |
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7352 ++s->mb_y; |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7353 } |
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
7354 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
|
7355 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
|
7356 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7357 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
|
7358 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
|
7359 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7360 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
|
7361 }else{ |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7362 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
|
7363 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7364 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
|
7365 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7366 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7367 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7368 |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7369 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){ |
2392 | 7370 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
|
7371 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){ |
1168 | 7372 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); |
7373 | |
7374 return 0; | |
7375 }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
|
7376 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 | 7377 |
7378 return -1; | |
7379 } | |
7380 } | |
7381 } | |
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7382 } |
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
7383 |
1168 | 7384 #if 0 |
7385 for(;s->mb_y < s->mb_height; s->mb_y++){ | |
7386 for(;s->mb_x < s->mb_width; s->mb_x++){ | |
7387 int ret= decode_mb(h); | |
2967 | 7388 |
1168 | 7389 hl_decode_mb(h); |
7390 | |
7391 if(ret<0){ | |
3177 | 7392 av_log(s->avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); |
1168 | 7393 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); |
7394 | |
7395 return -1; | |
7396 } | |
2967 | 7397 |
1168 | 7398 if(++s->mb_x >= s->mb_width){ |
7399 s->mb_x=0; | |
7400 if(++s->mb_y >= s->mb_height){ | |
7401 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
7402 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); | |
7403 | |
7404 return 0; | |
7405 }else{ | |
7406 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); | |
7407 | |
7408 return -1; | |
7409 } | |
7410 } | |
7411 } | |
2967 | 7412 |
1168 | 7413 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){ |
7414 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
7415 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); | |
7416 | |
7417 return 0; | |
7418 }else{ | |
7419 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); | |
7420 | |
7421 return -1; | |
7422 } | |
7423 } | |
7424 } | |
7425 s->mb_x=0; | |
7426 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
7427 } | |
7428 #endif | |
7429 return -1; //not reached | |
7430 } | |
7431 | |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7432 static int decode_unregistered_user_data(H264Context *h, int size){ |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7433 MpegEncContext * const s = &h->s; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7434 uint8_t user_data[16+256]; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7435 int e, build, i; |
2967 | 7436 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7437 if(size<16) |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7438 return -1; |
2967 | 7439 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7440 for(i=0; i<sizeof(user_data)-1 && i<size; i++){ |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7441 user_data[i]= get_bits(&s->gb, 8); |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7442 } |
2967 | 7443 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7444 user_data[i]= 0; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7445 e= sscanf(user_data+16, "x264 - core %d"/*%s - H.264/MPEG-4 AVC codec - Copyleft 2005 - http://www.videolan.org/x264.html*/, &build); |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7446 if(e==1 && build>=0) |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7447 h->x264_build= build; |
2967 | 7448 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7449 if(s->avctx->debug & FF_DEBUG_BUGS) |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7450 av_log(s->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data+16); |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7451 |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7452 for(; i<size; i++) |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7453 skip_bits(&s->gb, 8); |
2967 | 7454 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7455 return 0; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7456 } |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7457 |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7458 static int decode_sei(H264Context *h){ |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7459 MpegEncContext * const s = &h->s; |
2967 | 7460 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7461 while(get_bits_count(&s->gb) + 16 < s->gb.size_in_bits){ |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7462 int size, type; |
2967 | 7463 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7464 type=0; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7465 do{ |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7466 type+= show_bits(&s->gb, 8); |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7467 }while(get_bits(&s->gb, 8) == 255); |
2967 | 7468 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7469 size=0; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7470 do{ |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7471 size+= show_bits(&s->gb, 8); |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7472 }while(get_bits(&s->gb, 8) == 255); |
2967 | 7473 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7474 switch(type){ |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7475 case 5: |
3318 | 7476 if(decode_unregistered_user_data(h, size) < 0) |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7477 return -1; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7478 break; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7479 default: |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7480 skip_bits(&s->gb, 8*size); |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7481 } |
2967 | 7482 |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7483 //FIXME check bits here |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7484 align_get_bits(&s->gb); |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7485 } |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7486 |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7487 return 0; |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7488 } |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7489 |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7490 static inline void decode_hrd_parameters(H264Context *h, SPS *sps){ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7491 MpegEncContext * const s = &h->s; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7492 int cpb_count, i; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7493 cpb_count = get_ue_golomb(&s->gb) + 1; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7494 get_bits(&s->gb, 4); /* bit_rate_scale */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7495 get_bits(&s->gb, 4); /* cpb_size_scale */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7496 for(i=0; i<cpb_count; i++){ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7497 get_ue_golomb(&s->gb); /* bit_rate_value_minus1 */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7498 get_ue_golomb(&s->gb); /* cpb_size_value_minus1 */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7499 get_bits1(&s->gb); /* cbr_flag */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7500 } |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7501 get_bits(&s->gb, 5); /* initial_cpb_removal_delay_length_minus1 */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7502 get_bits(&s->gb, 5); /* cpb_removal_delay_length_minus1 */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7503 get_bits(&s->gb, 5); /* dpb_output_delay_length_minus1 */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7504 get_bits(&s->gb, 5); /* time_offset_length */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7505 } |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7506 |
1168 | 7507 static inline int decode_vui_parameters(H264Context *h, SPS *sps){ |
7508 MpegEncContext * const s = &h->s; | |
7509 int aspect_ratio_info_present_flag, aspect_ratio_idc; | |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7510 int nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag; |
1168 | 7511 |
7512 aspect_ratio_info_present_flag= get_bits1(&s->gb); | |
2967 | 7513 |
1168 | 7514 if( aspect_ratio_info_present_flag ) { |
7515 aspect_ratio_idc= get_bits(&s->gb, 8); | |
7516 if( aspect_ratio_idc == EXTENDED_SAR ) { | |
1548 | 7517 sps->sar.num= get_bits(&s->gb, 16); |
7518 sps->sar.den= get_bits(&s->gb, 16); | |
3196
15157293beea
fixing coverity warnig CID: 253 (reading over the end of the aspect_ratio array for illegal aspect ratios)
michael
parents:
3178
diff
changeset
|
7519 }else if(aspect_ratio_idc < 14){ |
1548 | 7520 sps->sar= pixel_aspect[aspect_ratio_idc]; |
1168 | 7521 }else{ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
7522 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n"); |
1168 | 7523 return -1; |
7524 } | |
7525 }else{ | |
2967 | 7526 sps->sar.num= |
1548 | 7527 sps->sar.den= 0; |
1168 | 7528 } |
7529 // 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
|
7530 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7531 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
|
7532 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
|
7533 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7534 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7535 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
|
7536 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
|
7537 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
|
7538 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
|
7539 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
|
7540 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
|
7541 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
|
7542 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7543 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7544 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7545 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
|
7546 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
|
7547 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
|
7548 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7549 |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7550 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
|
7551 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
|
7552 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
|
7553 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
|
7554 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
|
7555 } |
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
7556 |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7557 nal_hrd_parameters_present_flag = get_bits1(&s->gb); |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7558 if(nal_hrd_parameters_present_flag) |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7559 decode_hrd_parameters(h, sps); |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7560 vcl_hrd_parameters_present_flag = get_bits1(&s->gb); |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7561 if(vcl_hrd_parameters_present_flag) |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7562 decode_hrd_parameters(h, sps); |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7563 if(nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag) |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7564 get_bits1(&s->gb); /* low_delay_hrd_flag */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7565 get_bits1(&s->gb); /* pic_struct_present_flag */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7566 |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7567 sps->bitstream_restriction_flag = get_bits1(&s->gb); |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7568 if(sps->bitstream_restriction_flag){ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7569 get_bits1(&s->gb); /* motion_vectors_over_pic_boundaries_flag */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7570 get_ue_golomb(&s->gb); /* max_bytes_per_pic_denom */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7571 get_ue_golomb(&s->gb); /* max_bits_per_mb_denom */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7572 get_ue_golomb(&s->gb); /* log2_max_mv_length_horizontal */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7573 get_ue_golomb(&s->gb); /* log2_max_mv_length_vertical */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7574 sps->num_reorder_frames = get_ue_golomb(&s->gb); |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7575 get_ue_golomb(&s->gb); /* max_dec_frame_buffering */ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7576 } |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7577 |
1168 | 7578 return 0; |
7579 } | |
7580 | |
3004 | 7581 static void decode_scaling_list(H264Context *h, uint8_t *factors, int size, |
7582 const uint8_t *jvt_list, const uint8_t *fallback_list){ | |
2919 | 7583 MpegEncContext * const s = &h->s; |
7584 int i, last = 8, next = 8; | |
7585 const uint8_t *scan = size == 16 ? zigzag_scan : zigzag_scan8x8; | |
3004 | 7586 if(!get_bits1(&s->gb)) /* matrix not written, we use the predicted one */ |
7587 memcpy(factors, fallback_list, size*sizeof(uint8_t)); | |
2919 | 7588 else |
7589 for(i=0;i<size;i++){ | |
7590 if(next) | |
7591 next = (last + get_se_golomb(&s->gb)) & 0xff; | |
3004 | 7592 if(!i && !next){ /* matrix not written, we use the preset one */ |
7593 memcpy(factors, jvt_list, size*sizeof(uint8_t)); | |
2919 | 7594 break; |
7595 } | |
7596 last = factors[scan[i]] = next ? next : last; | |
7597 } | |
7598 } | |
7599 | |
7600 static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_sps, | |
7601 uint8_t (*scaling_matrix4)[16], uint8_t (*scaling_matrix8)[64]){ | |
7602 MpegEncContext * const s = &h->s; | |
7603 int fallback_sps = !is_sps && sps->scaling_matrix_present; | |
7604 const uint8_t *fallback[4] = { | |
7605 fallback_sps ? sps->scaling_matrix4[0] : default_scaling4[0], | |
7606 fallback_sps ? sps->scaling_matrix4[3] : default_scaling4[1], | |
7607 fallback_sps ? sps->scaling_matrix8[0] : default_scaling8[0], | |
7608 fallback_sps ? sps->scaling_matrix8[1] : default_scaling8[1] | |
7609 }; | |
7610 if(get_bits1(&s->gb)){ | |
7611 sps->scaling_matrix_present |= is_sps; | |
3004 | 7612 decode_scaling_list(h,scaling_matrix4[0],16,default_scaling4[0],fallback[0]); // Intra, Y |
7613 decode_scaling_list(h,scaling_matrix4[1],16,default_scaling4[0],scaling_matrix4[0]); // Intra, Cr | |
7614 decode_scaling_list(h,scaling_matrix4[2],16,default_scaling4[0],scaling_matrix4[1]); // Intra, Cb | |
7615 decode_scaling_list(h,scaling_matrix4[3],16,default_scaling4[1],fallback[1]); // Inter, Y | |
7616 decode_scaling_list(h,scaling_matrix4[4],16,default_scaling4[1],scaling_matrix4[3]); // Inter, Cr | |
7617 decode_scaling_list(h,scaling_matrix4[5],16,default_scaling4[1],scaling_matrix4[4]); // Inter, Cb | |
2919 | 7618 if(is_sps || pps->transform_8x8_mode){ |
3004 | 7619 decode_scaling_list(h,scaling_matrix8[0],64,default_scaling8[0],fallback[2]); // Intra, Y |
7620 decode_scaling_list(h,scaling_matrix8[1],64,default_scaling8[1],fallback[3]); // Inter, Y | |
2919 | 7621 } |
7622 } else if(fallback_sps) { | |
7623 memcpy(scaling_matrix4, sps->scaling_matrix4, 6*16*sizeof(uint8_t)); | |
7624 memcpy(scaling_matrix8, sps->scaling_matrix8, 2*64*sizeof(uint8_t)); | |
7625 } | |
7626 } | |
7627 | |
1168 | 7628 static inline int decode_seq_parameter_set(H264Context *h){ |
7629 MpegEncContext * const s = &h->s; | |
1371 | 7630 int profile_idc, level_idc; |
1168 | 7631 int sps_id, i; |
7632 SPS *sps; | |
2967 | 7633 |
1168 | 7634 profile_idc= get_bits(&s->gb, 8); |
1371 | 7635 get_bits1(&s->gb); //constraint_set0_flag |
7636 get_bits1(&s->gb); //constraint_set1_flag | |
7637 get_bits1(&s->gb); //constraint_set2_flag | |
2312 | 7638 get_bits1(&s->gb); //constraint_set3_flag |
7639 get_bits(&s->gb, 4); // reserved | |
1168 | 7640 level_idc= get_bits(&s->gb, 8); |
7641 sps_id= get_ue_golomb(&s->gb); | |
2967 | 7642 |
1168 | 7643 sps= &h->sps_buffer[ sps_id ]; |
7644 sps->profile_idc= profile_idc; | |
7645 sps->level_idc= level_idc; | |
2312 | 7646 |
2755 | 7647 if(sps->profile_idc >= 100){ //high profile |
7648 if(get_ue_golomb(&s->gb) == 3) //chroma_format_idc | |
7649 get_bits1(&s->gb); //residual_color_transform_flag | |
7650 get_ue_golomb(&s->gb); //bit_depth_luma_minus8 | |
7651 get_ue_golomb(&s->gb); //bit_depth_chroma_minus8 | |
2763 | 7652 sps->transform_bypass = get_bits1(&s->gb); |
2919 | 7653 decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8); |
7654 }else | |
7655 sps->scaling_matrix_present = 0; | |
2755 | 7656 |
1168 | 7657 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4; |
7658 sps->poc_type= get_ue_golomb(&s->gb); | |
2967 | 7659 |
1168 | 7660 if(sps->poc_type == 0){ //FIXME #define |
7661 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4; | |
7662 } else if(sps->poc_type == 1){//FIXME #define | |
7663 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb); | |
7664 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb); | |
7665 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb); | |
7666 sps->poc_cycle_length= get_ue_golomb(&s->gb); | |
2967 | 7667 |
1168 | 7668 for(i=0; i<sps->poc_cycle_length; i++) |
7669 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb); | |
7670 } | |
7671 if(sps->poc_type > 2){ | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
7672 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type); |
1168 | 7673 return -1; |
7674 } | |
7675 | |
7676 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
|
7677 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
|
7678 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
|
7679 } |
1371 | 7680 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb); |
1168 | 7681 sps->mb_width= get_ue_golomb(&s->gb) + 1; |
7682 sps->mb_height= get_ue_golomb(&s->gb) + 1; | |
2967 | 7683 if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 || |
2422 | 7684 avcodec_check_dimensions(NULL, 16*sps->mb_width, 16*sps->mb_height)) |
7685 return -1; | |
7686 | |
1168 | 7687 sps->frame_mbs_only_flag= get_bits1(&s->gb); |
7688 if(!sps->frame_mbs_only_flag) | |
7689 sps->mb_aff= get_bits1(&s->gb); | |
7690 else | |
7691 sps->mb_aff= 0; | |
7692 | |
7693 sps->direct_8x8_inference_flag= get_bits1(&s->gb); | |
7694 | |
3316 | 7695 #ifndef ALLOW_INTERLACE |
7696 if(sps->mb_aff) | |
7697 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF support not included; enable it compilation time\n"); | |
7698 #endif | |
7699 if(!sps->direct_8x8_inference_flag && sps->mb_aff) | |
7700 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + !direct_8x8_inference is not implemented\n"); | |
7701 | |
1371 | 7702 sps->crop= get_bits1(&s->gb); |
7703 if(sps->crop){ | |
7704 sps->crop_left = get_ue_golomb(&s->gb); | |
7705 sps->crop_right = get_ue_golomb(&s->gb); | |
7706 sps->crop_top = get_ue_golomb(&s->gb); | |
7707 sps->crop_bottom= get_ue_golomb(&s->gb); | |
7708 if(sps->crop_left || sps->crop_top){ | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
7709 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n"); |
1371 | 7710 } |
7711 }else{ | |
2967 | 7712 sps->crop_left = |
7713 sps->crop_right = | |
7714 sps->crop_top = | |
1371 | 7715 sps->crop_bottom= 0; |
7716 } | |
7717 | |
1168 | 7718 sps->vui_parameters_present_flag= get_bits1(&s->gb); |
7719 if( sps->vui_parameters_present_flag ) | |
7720 decode_vui_parameters(h, sps); | |
2967 | 7721 |
1168 | 7722 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
2967 | 7723 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 | 7724 sps_id, sps->profile_idc, sps->level_idc, |
7725 sps->poc_type, | |
7726 sps->ref_frame_count, | |
7727 sps->mb_width, sps->mb_height, | |
7728 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"), | |
7729 sps->direct_8x8_inference_flag ? "8B8" : "", | |
2967 | 7730 sps->crop_left, sps->crop_right, |
7731 sps->crop_top, sps->crop_bottom, | |
1168 | 7732 sps->vui_parameters_present_flag ? "VUI" : "" |
7733 ); | |
7734 } | |
7735 return 0; | |
7736 } | |
7737 | |
2755 | 7738 static inline int decode_picture_parameter_set(H264Context *h, int bit_length){ |
1168 | 7739 MpegEncContext * const s = &h->s; |
7740 int pps_id= get_ue_golomb(&s->gb); | |
7741 PPS *pps= &h->pps_buffer[pps_id]; | |
2967 | 7742 |
1168 | 7743 pps->sps_id= get_ue_golomb(&s->gb); |
7744 pps->cabac= get_bits1(&s->gb); | |
7745 pps->pic_order_present= get_bits1(&s->gb); | |
7746 pps->slice_group_count= get_ue_golomb(&s->gb) + 1; | |
7747 if(pps->slice_group_count > 1 ){ | |
7748 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
|
7749 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n"); |
1168 | 7750 switch(pps->mb_slice_group_map_type){ |
7751 case 0: | |
7752 #if 0 | |
7753 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | | | |
7754 | run_length[ i ] |1 |ue(v) | | |
7755 #endif | |
7756 break; | |
7757 case 2: | |
7758 #if 0 | |
7759 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | | | |
7760 |{ | | | | |
7761 | top_left_mb[ i ] |1 |ue(v) | | |
7762 | bottom_right_mb[ i ] |1 |ue(v) | | |
7763 | } | | | | |
7764 #endif | |
7765 break; | |
7766 case 3: | |
7767 case 4: | |
7768 case 5: | |
7769 #if 0 | |
7770 | slice_group_change_direction_flag |1 |u(1) | | |
7771 | slice_group_change_rate_minus1 |1 |ue(v) | | |
7772 #endif | |
7773 break; | |
7774 case 6: | |
7775 #if 0 | |
7776 | slice_group_id_cnt_minus1 |1 |ue(v) | | |
7777 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | | | |
7778 |) | | | | |
7779 | slice_group_id[ i ] |1 |u(v) | | |
7780 #endif | |
1214 | 7781 break; |
1168 | 7782 } |
7783 } | |
7784 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
7785 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
7786 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
|
7787 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n"); |
1168 | 7788 return -1; |
7789 } | |
2967 | 7790 |
1168 | 7791 pps->weighted_pred= get_bits1(&s->gb); |
7792 pps->weighted_bipred_idc= get_bits(&s->gb, 2); | |
7793 pps->init_qp= get_se_golomb(&s->gb) + 26; | |
7794 pps->init_qs= get_se_golomb(&s->gb) + 26; | |
7795 pps->chroma_qp_index_offset= get_se_golomb(&s->gb); | |
7796 pps->deblocking_filter_parameters_present= get_bits1(&s->gb); | |
7797 pps->constrained_intra_pred= get_bits1(&s->gb); | |
7798 pps->redundant_pic_cnt_present = get_bits1(&s->gb); | |
2967 | 7799 |
3291
454de57e45cf
reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents:
3285
diff
changeset
|
7800 pps->transform_8x8_mode= 0; |
454de57e45cf
reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents:
3285
diff
changeset
|
7801 h->dequant_coeff_pps= -1; //contents of sps/pps can change even if id doesn't, so reinit |
2919 | 7802 memset(pps->scaling_matrix4, 16, 6*16*sizeof(uint8_t)); |
7803 memset(pps->scaling_matrix8, 16, 2*64*sizeof(uint8_t)); | |
2755 | 7804 |
7805 if(get_bits_count(&s->gb) < bit_length){ | |
7806 pps->transform_8x8_mode= get_bits1(&s->gb); | |
2919 | 7807 decode_scaling_matrices(h, &h->sps_buffer[pps->sps_id], pps, 0, pps->scaling_matrix4, pps->scaling_matrix8); |
2755 | 7808 get_se_golomb(&s->gb); //second_chroma_qp_index_offset |
7809 } | |
2967 | 7810 |
1168 | 7811 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
2967 | 7812 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 %s\n", |
1168 | 7813 pps_id, pps->sps_id, |
7814 pps->cabac ? "CABAC" : "CAVLC", | |
7815 pps->slice_group_count, | |
7816 pps->ref_count[0], pps->ref_count[1], | |
7817 pps->weighted_pred ? "weighted" : "", | |
7818 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset, | |
7819 pps->deblocking_filter_parameters_present ? "LPAR" : "", | |
7820 pps->constrained_intra_pred ? "CONSTR" : "", | |
2755 | 7821 pps->redundant_pic_cnt_present ? "REDU" : "", |
7822 pps->transform_8x8_mode ? "8x8DCT" : "" | |
1168 | 7823 ); |
7824 } | |
2967 | 7825 |
1168 | 7826 return 0; |
7827 } | |
7828 | |
7829 /** | |
7830 * finds the end of the current frame in the bitstream. | |
7831 * @return the position of the first byte of the next frame, or -1 | |
7832 */ | |
2392 | 7833 static int find_frame_end(H264Context *h, const uint8_t *buf, int buf_size){ |
1187 | 7834 int i; |
1168 | 7835 uint32_t state; |
2392 | 7836 ParseContext *pc = &(h->s.parse_context); |
1168 | 7837 //printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]); |
7838 // mb_addr= pc->mb_addr - 1; | |
7839 state= pc->state; | |
2392 | 7840 for(i=0; i<=buf_size; i++){ |
1168 | 7841 if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){ |
2392 | 7842 tprintf("find_frame_end new startcode = %08x, frame_start_found = %d, pos = %d\n", state, pc->frame_start_found, i); |
1168 | 7843 if(pc->frame_start_found){ |
2392 | 7844 // If there isn't one more byte in the buffer |
7845 // the test on first_mb_in_slice cannot be done yet | |
7846 // do it at next call. | |
7847 if (i >= buf_size) break; | |
7848 if (buf[i] & 0x80) { | |
7849 // first_mb_in_slice is 0, probably the first nal of a new | |
7850 // slice | |
7851 tprintf("find_frame_end frame_end_found, state = %08x, pos = %d\n", state, i); | |
2967 | 7852 pc->state=-1; |
2392 | 7853 pc->frame_start_found= 0; |
7854 return i-4; | |
7855 } | |
1168 | 7856 } |
2392 | 7857 pc->frame_start_found = 1; |
1168 | 7858 } |
2774
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7859 if((state&0xFFFFFF1F) == 0x107 || (state&0xFFFFFF1F) == 0x108 || (state&0xFFFFFF1F) == 0x109){ |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7860 if(pc->frame_start_found){ |
2967 | 7861 pc->state=-1; |
2774
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7862 pc->frame_start_found= 0; |
2967 | 7863 return i-4; |
2774
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7864 } |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7865 } |
2392 | 7866 if (i<buf_size) |
7867 state= (state<<8) | buf[i]; | |
1168 | 7868 } |
2967 | 7869 |
1168 | 7870 pc->state= state; |
1219 | 7871 return END_NOT_FOUND; |
1168 | 7872 } |
7873 | |
3455
cc4b4ea83e29
--enable/disable parsers. Warning: some combinations are broken.
mru
parents:
3409
diff
changeset
|
7874 #ifdef CONFIG_H264_PARSER |
1988 | 7875 static int h264_parse(AVCodecParserContext *s, |
7876 AVCodecContext *avctx, | |
2967 | 7877 uint8_t **poutbuf, int *poutbuf_size, |
1988 | 7878 const uint8_t *buf, int buf_size) |
7879 { | |
2392 | 7880 H264Context *h = s->priv_data; |
7881 ParseContext *pc = &h->s.parse_context; | |
1988 | 7882 int next; |
2967 | 7883 |
2392 | 7884 next= find_frame_end(h, buf, buf_size); |
1988 | 7885 |
7886 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { | |
7887 *poutbuf = NULL; | |
7888 *poutbuf_size = 0; | |
7889 return buf_size; | |
7890 } | |
7891 | |
7892 *poutbuf = (uint8_t *)buf; | |
7893 *poutbuf_size = buf_size; | |
7894 return next; | |
7895 } | |
7896 | |
2774
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7897 static int h264_split(AVCodecContext *avctx, |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7898 const uint8_t *buf, int buf_size) |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7899 { |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7900 int i; |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7901 uint32_t state = -1; |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7902 int has_sps= 0; |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7903 |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7904 for(i=0; i<=buf_size; i++){ |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7905 if((state&0xFFFFFF1F) == 0x107) |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7906 has_sps=1; |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7907 /* if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){ |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7908 }*/ |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7909 if((state&0xFFFFFF00) == 0x100 && (state&0xFFFFFF1F) != 0x107 && (state&0xFFFFFF1F) != 0x108 && (state&0xFFFFFF1F) != 0x109){ |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7910 if(has_sps){ |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7911 while(i>4 && buf[i-5]==0) i--; |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7912 return i-4; |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7913 } |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7914 } |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7915 if (i<buf_size) |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7916 state= (state<<8) | buf[i]; |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7917 } |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7918 return 0; |
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7919 } |
3455
cc4b4ea83e29
--enable/disable parsers. Warning: some combinations are broken.
mru
parents:
3409
diff
changeset
|
7920 #endif /* CONFIG_H264_PARSER */ |
2774
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7921 |
1168 | 7922 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ |
7923 MpegEncContext * const s = &h->s; | |
7924 AVCodecContext * const avctx= s->avctx; | |
7925 int buf_index=0; | |
1322 | 7926 #if 0 |
1168 | 7927 int i; |
2867
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
7928 for(i=0; i<50; i++){ |
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
7929 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]); |
1168 | 7930 } |
7931 #endif | |
2392 | 7932 h->slice_num = 0; |
2766
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
7933 s->current_picture_ptr= NULL; |
1168 | 7934 for(;;){ |
7935 int consumed; | |
7936 int dst_length; | |
7937 int bit_length; | |
7938 uint8_t *ptr; | |
2227 | 7939 int i, nalsize = 0; |
2967 | 7940 |
2227 | 7941 if(h->is_avc) { |
7942 if(buf_index >= buf_size) break; | |
7943 nalsize = 0; | |
7944 for(i = 0; i < h->nal_length_size; i++) | |
7945 nalsize = (nalsize << 8) | buf[buf_index++]; | |
3126 | 7946 if(nalsize <= 1){ |
7947 if(nalsize == 1){ | |
7948 buf_index++; | |
7949 continue; | |
7950 }else{ | |
7951 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize); | |
7952 break; | |
7953 } | |
7954 } | |
2227 | 7955 } else { |
1168 | 7956 // start code prefix search |
7957 for(; buf_index + 3 < buf_size; buf_index++){ | |
7958 // this should allways succeed in the first iteration | |
7959 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | |
7960 break; | |
7961 } | |
2967 | 7962 |
1168 | 7963 if(buf_index+3 >= buf_size) break; |
2967 | 7964 |
1168 | 7965 buf_index+=3; |
2967 | 7966 } |
7967 | |
2401
46898a9fd6dc
Fix avc1 if there is nore than one nal per mov frame
rtognimp
parents:
2396
diff
changeset
|
7968 ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index); |
3341 | 7969 while(ptr[dst_length - 1] == 0 && dst_length > 1) |
7970 dst_length--; | |
1168 | 7971 bit_length= 8*dst_length - decode_rbsp_trailing(ptr + dst_length - 1); |
7972 | |
7973 if(s->avctx->debug&FF_DEBUG_STARTCODE){ | |
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
7974 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 | 7975 } |
2967 | 7976 |
2227 | 7977 if (h->is_avc && (nalsize != consumed)) |
7978 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); | |
7979 | |
1168 | 7980 buf_index += consumed; |
7981 | |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
7982 if( (s->hurry_up == 1 && h->nal_ref_idc == 0) //FIXME dont discard SEI id |
2792 | 7983 ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0)) |
1168 | 7984 continue; |
2967 | 7985 |
1168 | 7986 switch(h->nal_unit_type){ |
7987 case NAL_IDR_SLICE: | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7988 idr(h); //FIXME ensure we don't loose some frames if there is reordering |
1168 | 7989 case NAL_SLICE: |
7990 init_get_bits(&s->gb, ptr, bit_length); | |
7991 h->intra_gb_ptr= | |
7992 h->inter_gb_ptr= &s->gb; | |
7993 s->data_partitioning = 0; | |
2967 | 7994 |
2771 | 7995 if(decode_slice_header(h) < 0){ |
7996 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n"); | |
7997 break; | |
7998 } | |
3161
e3e94632c6e9
keyframe flag was wrong if SEIs followed the keyframe
lorenm
parents:
3145
diff
changeset
|
7999 s->current_picture_ptr->key_frame= (h->nal_unit_type == NAL_IDR_SLICE); |
2967 | 8000 if(h->redundant_pic_count==0 && s->hurry_up < 5 |
2793 | 8001 && (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc) |
8002 && (avctx->skip_frame < AVDISCARD_BIDIR || h->slice_type!=B_TYPE) | |
8003 && (avctx->skip_frame < AVDISCARD_NONKEY || h->slice_type==I_TYPE) | |
8004 && avctx->skip_frame < AVDISCARD_ALL) | |
1168 | 8005 decode_slice(h); |
8006 break; | |
8007 case NAL_DPA: | |
8008 init_get_bits(&s->gb, ptr, bit_length); | |
8009 h->intra_gb_ptr= | |
8010 h->inter_gb_ptr= NULL; | |
8011 s->data_partitioning = 1; | |
2967 | 8012 |
2771 | 8013 if(decode_slice_header(h) < 0){ |
8014 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n"); | |
8015 } | |
1168 | 8016 break; |
8017 case NAL_DPB: | |
8018 init_get_bits(&h->intra_gb, ptr, bit_length); | |
8019 h->intra_gb_ptr= &h->intra_gb; | |
8020 break; | |
8021 case NAL_DPC: | |
8022 init_get_bits(&h->inter_gb, ptr, bit_length); | |
8023 h->inter_gb_ptr= &h->inter_gb; | |
1174 | 8024 |
2967 | 8025 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning |
2793 | 8026 && s->hurry_up < 5 |
8027 && (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc) | |
8028 && (avctx->skip_frame < AVDISCARD_BIDIR || h->slice_type!=B_TYPE) | |
8029 && (avctx->skip_frame < AVDISCARD_NONKEY || h->slice_type==I_TYPE) | |
8030 && avctx->skip_frame < AVDISCARD_ALL) | |
1168 | 8031 decode_slice(h); |
8032 break; | |
8033 case NAL_SEI: | |
2815
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
8034 init_get_bits(&s->gb, ptr, bit_length); |
636133fccbdc
workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents:
2809
diff
changeset
|
8035 decode_sei(h); |
1168 | 8036 break; |
8037 case NAL_SPS: | |
8038 init_get_bits(&s->gb, ptr, bit_length); | |
8039 decode_seq_parameter_set(h); | |
2967 | 8040 |
1168 | 8041 if(s->flags& CODEC_FLAG_LOW_DELAY) |
8042 s->low_delay=1; | |
2967 | 8043 |
2538 | 8044 if(avctx->has_b_frames < 2) |
8045 avctx->has_b_frames= !s->low_delay; | |
1168 | 8046 break; |
8047 case NAL_PPS: | |
8048 init_get_bits(&s->gb, ptr, bit_length); | |
2967 | 8049 |
2755 | 8050 decode_picture_parameter_set(h, bit_length); |
1168 | 8051 |
8052 break; | |
2960 | 8053 case NAL_AUD: |
8054 case NAL_END_SEQUENCE: | |
8055 case NAL_END_STREAM: | |
8056 case NAL_FILLER_DATA: | |
8057 case NAL_SPS_EXT: | |
8058 case NAL_AUXILIARY_SLICE: | |
1168 | 8059 break; |
2979 | 8060 default: |
8061 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type); | |
2967 | 8062 } |
8063 } | |
8064 | |
1174 | 8065 if(!s->current_picture_ptr) return buf_index; //no frame |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8066 |
2971 | 8067 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264; |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8068 s->current_picture_ptr->pict_type= s->pict_type; |
2967 | 8069 |
1168 | 8070 h->prev_frame_num_offset= h->frame_num_offset; |
8071 h->prev_frame_num= h->frame_num; | |
8072 if(s->current_picture_ptr->reference){ | |
8073 h->prev_poc_msb= h->poc_msb; | |
8074 h->prev_poc_lsb= h->poc_lsb; | |
8075 } | |
8076 if(s->current_picture_ptr->reference) | |
8077 execute_ref_pic_marking(h, h->mmco, h->mmco_index); | |
8078 | |
8079 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
|
8080 |
1168 | 8081 MPV_frame_end(s); |
8082 | |
8083 return buf_index; | |
8084 } | |
8085 | |
8086 /** | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
8087 * returns the number of bytes consumed for building the current frame |
1168 | 8088 */ |
8089 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){ | |
8090 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
8091 pos -= s->parse_context.last_index; | |
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
8092 if(pos<0) pos=0; // FIXME remove (unneeded?) |
2967 | 8093 |
1168 | 8094 return pos; |
8095 }else{ | |
8096 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...) | |
8097 if(pos+10>buf_size) pos=buf_size; // oops ;) | |
8098 | |
8099 return pos; | |
8100 } | |
8101 } | |
8102 | |
2967 | 8103 static int decode_frame(AVCodecContext *avctx, |
1168 | 8104 void *data, int *data_size, |
8105 uint8_t *buf, int buf_size) | |
8106 { | |
8107 H264Context *h = avctx->priv_data; | |
8108 MpegEncContext *s = &h->s; | |
2967 | 8109 AVFrame *pict = data; |
1168 | 8110 int buf_index; |
2967 | 8111 |
1168 | 8112 s->flags= avctx->flags; |
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1706
diff
changeset
|
8113 s->flags2= avctx->flags2; |
1168 | 8114 |
8115 /* no supplementary picture */ | |
8116 if (buf_size == 0) { | |
8117 return 0; | |
8118 } | |
2967 | 8119 |
1168 | 8120 if(s->flags&CODEC_FLAG_TRUNCATED){ |
2392 | 8121 int next= find_frame_end(h, buf, buf_size); |
2967 | 8122 |
1988 | 8123 if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 ) |
1168 | 8124 return buf_size; |
8125 //printf("next:%d buf_size:%d last_index:%d\n", next, buf_size, s->parse_context.last_index); | |
8126 } | |
8127 | |
2227 | 8128 if(h->is_avc && !h->got_avcC) { |
8129 int i, cnt, nalsize; | |
8130 unsigned char *p = avctx->extradata; | |
8131 if(avctx->extradata_size < 7) { | |
8132 av_log(avctx, AV_LOG_ERROR, "avcC too short\n"); | |
8133 return -1; | |
8134 } | |
8135 if(*p != 1) { | |
8136 av_log(avctx, AV_LOG_ERROR, "Unknown avcC version %d\n", *p); | |
8137 return -1; | |
8138 } | |
8139 /* sps and pps in the avcC always have length coded with 2 bytes, | |
8140 so put a fake nal_length_size = 2 while parsing them */ | |
8141 h->nal_length_size = 2; | |
8142 // Decode sps from avcC | |
8143 cnt = *(p+5) & 0x1f; // Number of sps | |
8144 p += 6; | |
8145 for (i = 0; i < cnt; i++) { | |
8146 nalsize = BE_16(p) + 2; | |
2867
7c7edddaa835
dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents:
2861
diff
changeset
|
8147 if(decode_nal_units(h, p, nalsize) < 0) { |
2227 | 8148 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); |
8149 return -1; | |
8150 } | |
8151 p += nalsize; | |
2967 | 8152 } |
2227 | 8153 // Decode pps from avcC |
8154 cnt = *(p++); // Number of pps | |
8155 for (i = 0; i < cnt; i++) { | |
8156 nalsize = BE_16(p) + 2; | |
8157 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
8158 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); | |
8159 return -1; | |
8160 } | |
8161 p += nalsize; | |
2967 | 8162 } |
2227 | 8163 // Now store right nal length size, that will be use to parse all other nals |
8164 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1; | |
8165 // Do not reparse avcC | |
8166 h->got_avcC = 1; | |
8167 } | |
8168 | |
8169 if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){ | |
2967 | 8170 if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0) |
1168 | 8171 return -1; |
8172 } | |
8173 | |
8174 buf_index=decode_nal_units(h, buf, buf_size); | |
2967 | 8175 if(buf_index < 0) |
1168 | 8176 return -1; |
8177 | |
2967 | 8178 //FIXME do something with unavailable reference frames |
8179 | |
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
8180 // if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_index, buf_size); |
1174 | 8181 if(!s->current_picture_ptr){ |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
8182 av_log(h->s.avctx, AV_LOG_DEBUG, "error, NO frame\n"); |
1174 | 8183 return -1; |
8184 } | |
8185 | |
2409 | 8186 { |
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
|
8187 Picture *out = s->current_picture_ptr; |
2561 | 8188 #if 0 //decode order |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8189 *data_size = sizeof(AVFrame); |
2561 | 8190 #else |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8191 /* Sort B-frames into display order */ |
2409 | 8192 Picture *cur = s->current_picture_ptr; |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8193 Picture *prev = h->delayed_output_pic; |
3298
9637da0a9c1b
cosmetics (initalize variables where they are used)
michael
parents:
3297
diff
changeset
|
8194 int i, pics, cross_idr, out_of_order, out_idx; |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8195 |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8196 if(h->sps.bitstream_restriction_flag |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8197 && s->avctx->has_b_frames < h->sps.num_reorder_frames){ |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8198 s->avctx->has_b_frames = h->sps.num_reorder_frames; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8199 s->low_delay = 0; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8200 } |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8201 |
3298
9637da0a9c1b
cosmetics (initalize variables where they are used)
michael
parents:
3297
diff
changeset
|
8202 pics = 0; |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8203 while(h->delayed_pic[pics]) pics++; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8204 h->delayed_pic[pics++] = cur; |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8205 if(cur->reference == 0) |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8206 cur->reference = 1; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8207 |
3298
9637da0a9c1b
cosmetics (initalize variables where they are used)
michael
parents:
3297
diff
changeset
|
8208 cross_idr = 0; |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8209 for(i=0; h->delayed_pic[i]; i++) |
2649
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
8210 if(h->delayed_pic[i]->key_frame || h->delayed_pic[i]->poc==0) |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8211 cross_idr = 1; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8212 |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8213 out = h->delayed_pic[0]; |
3298
9637da0a9c1b
cosmetics (initalize variables where they are used)
michael
parents:
3297
diff
changeset
|
8214 out_idx = 0; |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8215 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++) |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8216 if(h->delayed_pic[i]->poc < out->poc){ |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8217 out = h->delayed_pic[i]; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8218 out_idx = i; |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8219 } |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8220 |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8221 out_of_order = !cross_idr && prev && out->poc < prev->poc; |
3125 | 8222 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames) |
8223 { } | |
8224 else if(prev && pics <= s->avctx->has_b_frames) | |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8225 out = prev; |
2923 | 8226 else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15) |
2967 | 8227 || (s->low_delay && |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8228 ((!cross_idr && prev && out->poc > prev->poc + 2) |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8229 || cur->pict_type == B_TYPE))) |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8230 { |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8231 s->low_delay = 0; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8232 s->avctx->has_b_frames++; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8233 out = prev; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8234 } |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8235 else if(out_of_order) |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8236 out = prev; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8237 |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8238 if(out_of_order || pics > s->avctx->has_b_frames){ |
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8239 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
|
8240 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
|
8241 } |
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
8242 |
3297
9ae9653d706c
decoders should (IMHO) not duplicate frames, the application can do this if it wants
michael
parents:
3291
diff
changeset
|
8243 if(prev == out) |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8244 *data_size = 0; |
2561 | 8245 else |
8246 *data_size = sizeof(AVFrame); | |
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8247 if(prev && prev != out && prev->reference == 1) |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8248 prev->reference = 0; |
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
8249 h->delayed_output_pic = out; |
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
|
8250 #endif |
2409 | 8251 |
2937 | 8252 if(out) |
8253 *pict= *(AVFrame*)out; | |
8254 else | |
8255 av_log(avctx, AV_LOG_DEBUG, "no picture\n"); | |
8256 } | |
8257 | |
8258 assert(pict->data[0] || !*data_size); | |
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1698
diff
changeset
|
8259 ff_print_debug_info(s, pict); |
1168 | 8260 //printf("out %d\n", (int)pict->data[0]); |
8261 #if 0 //? | |
8262 | |
8263 /* Return the Picture timestamp as the frame number */ | |
8264 /* we substract 1 because it is added on utils.c */ | |
8265 avctx->frame_number = s->picture_number - 1; | |
8266 #endif | |
8267 return get_consumed_bytes(s, buf_index, buf_size); | |
8268 } | |
8269 #if 0 | |
8270 static inline void fill_mb_avail(H264Context *h){ | |
8271 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
|
8272 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
1168 | 8273 |
8274 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
|
8275 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
|
8276 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
|
8277 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num; |
1168 | 8278 }else{ |
8279 h->mb_avail[0]= | |
8280 h->mb_avail[1]= | |
8281 h->mb_avail[2]= 0; | |
8282 } | |
8283 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num; | |
8284 h->mb_avail[4]= 1; //FIXME move out | |
8285 h->mb_avail[5]= 0; //FIXME move out | |
8286 } | |
8287 #endif | |
8288 | |
8289 #if 0 //selftest | |
8290 #define COUNT 8000 | |
8291 #define SIZE (COUNT*40) | |
8292 int main(){ | |
8293 int i; | |
8294 uint8_t temp[SIZE]; | |
8295 PutBitContext pb; | |
8296 GetBitContext gb; | |
8297 // int int_temp[10000]; | |
8298 DSPContext dsp; | |
8299 AVCodecContext avctx; | |
2967 | 8300 |
1168 | 8301 dsputil_init(&dsp, &avctx); |
8302 | |
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1453
diff
changeset
|
8303 init_put_bits(&pb, temp, SIZE); |
1168 | 8304 printf("testing unsigned exp golomb\n"); |
8305 for(i=0; i<COUNT; i++){ | |
8306 START_TIMER | |
8307 set_ue_golomb(&pb, i); | |
8308 STOP_TIMER("set_ue_golomb"); | |
8309 } | |
8310 flush_put_bits(&pb); | |
2967 | 8311 |
1168 | 8312 init_get_bits(&gb, temp, 8*SIZE); |
8313 for(i=0; i<COUNT; i++){ | |
8314 int j, s; | |
2967 | 8315 |
1168 | 8316 s= show_bits(&gb, 24); |
2967 | 8317 |
1168 | 8318 START_TIMER |
8319 j= get_ue_golomb(&gb); | |
8320 if(j != i){ | |
8321 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
8322 // return -1; | |
8323 } | |
8324 STOP_TIMER("get_ue_golomb"); | |
8325 } | |
2967 | 8326 |
8327 | |
1524 | 8328 init_put_bits(&pb, temp, SIZE); |
1168 | 8329 printf("testing signed exp golomb\n"); |
8330 for(i=0; i<COUNT; i++){ | |
8331 START_TIMER | |
8332 set_se_golomb(&pb, i - COUNT/2); | |
8333 STOP_TIMER("set_se_golomb"); | |
8334 } | |
8335 flush_put_bits(&pb); | |
2967 | 8336 |
1168 | 8337 init_get_bits(&gb, temp, 8*SIZE); |
8338 for(i=0; i<COUNT; i++){ | |
8339 int j, s; | |
2967 | 8340 |
1168 | 8341 s= show_bits(&gb, 24); |
2967 | 8342 |
1168 | 8343 START_TIMER |
8344 j= get_se_golomb(&gb); | |
8345 if(j != i - COUNT/2){ | |
8346 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
8347 // return -1; | |
8348 } | |
8349 STOP_TIMER("get_se_golomb"); | |
8350 } | |
8351 | |
8352 printf("testing 4x4 (I)DCT\n"); | |
2967 | 8353 |
1168 | 8354 DCTELEM block[16]; |
8355 uint8_t src[16], ref[16]; | |
8356 uint64_t error= 0, max_error=0; | |
8357 | |
8358 for(i=0; i<COUNT; i++){ | |
8359 int j; | |
8360 // printf("%d %d %d\n", r1, r2, (r2-r1)*16); | |
8361 for(j=0; j<16; j++){ | |
8362 ref[j]= random()%255; | |
8363 src[j]= random()%255; | |
8364 } | |
8365 | |
8366 h264_diff_dct_c(block, src, ref, 4); | |
2967 | 8367 |
1168 | 8368 //normalize |
8369 for(j=0; j<16; j++){ | |
8370 // printf("%d ", block[j]); | |
8371 block[j]= block[j]*4; | |
8372 if(j&1) block[j]= (block[j]*4 + 2)/5; | |
8373 if(j&4) block[j]= (block[j]*4 + 2)/5; | |
8374 } | |
8375 // printf("\n"); | |
2967 | 8376 |
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
8377 s->dsp.h264_idct_add(ref, block, 4); |
1168 | 8378 /* for(j=0; j<16; j++){ |
8379 printf("%d ", ref[j]); | |
8380 } | |
8381 printf("\n");*/ | |
2967 | 8382 |
1168 | 8383 for(j=0; j<16; j++){ |
8384 int diff= ABS(src[j] - ref[j]); | |
2967 | 8385 |
1168 | 8386 error+= diff*diff; |
8387 max_error= FFMAX(max_error, diff); | |
8388 } | |
8389 } | |
8390 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error ); | |
8391 #if 0 | |
8392 printf("testing quantizer\n"); | |
8393 for(qp=0; qp<52; qp++){ | |
8394 for(i=0; i<16; i++) | |
8395 src1_block[i]= src2_block[i]= random()%255; | |
2967 | 8396 |
1168 | 8397 } |
8398 #endif | |
8399 printf("Testing NAL layer\n"); | |
2967 | 8400 |
1168 | 8401 uint8_t bitstream[COUNT]; |
8402 uint8_t nal[COUNT*2]; | |
8403 H264Context h; | |
8404 memset(&h, 0, sizeof(H264Context)); | |
2967 | 8405 |
1168 | 8406 for(i=0; i<COUNT; i++){ |
8407 int zeros= i; | |
8408 int nal_length; | |
8409 int consumed; | |
8410 int out_length; | |
8411 uint8_t *out; | |
8412 int j; | |
2967 | 8413 |
1168 | 8414 for(j=0; j<COUNT; j++){ |
8415 bitstream[j]= (random() % 255) + 1; | |
8416 } | |
2967 | 8417 |
1168 | 8418 for(j=0; j<zeros; j++){ |
8419 int pos= random() % COUNT; | |
8420 while(bitstream[pos] == 0){ | |
8421 pos++; | |
8422 pos %= COUNT; | |
8423 } | |
8424 bitstream[pos]=0; | |
8425 } | |
2967 | 8426 |
1168 | 8427 START_TIMER |
2967 | 8428 |
1168 | 8429 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2); |
8430 if(nal_length<0){ | |
8431 printf("encoding failed\n"); | |
8432 return -1; | |
8433 } | |
2967 | 8434 |
1168 | 8435 out= decode_nal(&h, nal, &out_length, &consumed, nal_length); |
8436 | |
8437 STOP_TIMER("NAL") | |
2967 | 8438 |
1168 | 8439 if(out_length != COUNT){ |
8440 printf("incorrect length %d %d\n", out_length, COUNT); | |
8441 return -1; | |
8442 } | |
2967 | 8443 |
1168 | 8444 if(consumed != nal_length){ |
8445 printf("incorrect consumed length %d %d\n", nal_length, consumed); | |
8446 return -1; | |
8447 } | |
2967 | 8448 |
1168 | 8449 if(memcmp(bitstream, out, COUNT)){ |
8450 printf("missmatch\n"); | |
8451 return -1; | |
8452 } | |
8453 } | |
2967 | 8454 |
1168 | 8455 printf("Testing RBSP\n"); |
2967 | 8456 |
8457 | |
1168 | 8458 return 0; |
8459 } | |
8460 #endif | |
8461 | |
8462 | |
8463 static int decode_end(AVCodecContext *avctx) | |
8464 { | |
8465 H264Context *h = avctx->priv_data; | |
8466 MpegEncContext *s = &h->s; | |
2967 | 8467 |
2891
4c6eb826e9cb
Just noticed there is a memory leak in h264.c with the usage of rbsp_buffer.
michael
parents:
2883
diff
changeset
|
8468 av_freep(&h->rbsp_buffer); |
1168 | 8469 free_tables(h); //FIXME cleanup init stuff perhaps |
8470 MPV_common_end(s); | |
8471 | |
8472 // memset(h, 0, sizeof(H264Context)); | |
2967 | 8473 |
1168 | 8474 return 0; |
8475 } | |
8476 | |
8477 | |
8478 AVCodec h264_decoder = { | |
8479 "h264", | |
8480 CODEC_TYPE_VIDEO, | |
8481 CODEC_ID_H264, | |
8482 sizeof(H264Context), | |
8483 decode_init, | |
8484 NULL, | |
8485 decode_end, | |
8486 decode_frame, | |
2453 | 8487 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
2640 | 8488 .flush= flush_dpb, |
1168 | 8489 }; |
8490 | |
3455
cc4b4ea83e29
--enable/disable parsers. Warning: some combinations are broken.
mru
parents:
3409
diff
changeset
|
8491 #ifdef CONFIG_H264_PARSER |
1988 | 8492 AVCodecParser h264_parser = { |
8493 { CODEC_ID_H264 }, | |
2392 | 8494 sizeof(H264Context), |
1988 | 8495 NULL, |
8496 h264_parse, | |
8497 ff_parse_close, | |
2774
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
8498 h264_split, |
1988 | 8499 }; |
3455
cc4b4ea83e29
--enable/disable parsers. Warning: some combinations are broken.
mru
parents:
3409
diff
changeset
|
8500 #endif |
1988 | 8501 |
1234 | 8502 #include "svq3.c" |