Mercurial > libavcodec.hg
annotate h264.c @ 2311:cdbb2f30e08b libavcodec
small typo patch by (Gildas Bazin <gbazin at altern dot org>)
| author | michael |
|---|---|
| date | Fri, 22 Oct 2004 19:55:57 +0000 |
| parents | c5cd8a064c34 |
| children | cb958ec6dfee |
| rev | line source |
|---|---|
| 1168 | 1 /* |
| 2 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder | |
| 3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> | |
| 4 * | |
| 5 * This library is free software; you can redistribute it and/or | |
| 6 * modify it under the terms of the GNU Lesser General Public | |
| 7 * License as published by the Free Software Foundation; either | |
| 8 * version 2 of the License, or (at your option) any later version. | |
| 9 * | |
| 10 * This library is distributed in the hope that it will be useful, | |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 * Lesser General Public License for more details. | |
| 14 * | |
| 15 * You should have received a copy of the GNU Lesser General Public | |
| 16 * License along with this library; if not, write to the Free Software | |
| 17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 * | |
| 19 */ | |
| 20 | |
| 21 /** | |
| 22 * @file h264.c | |
| 23 * H.264 / AVC / MPEG4 part10 codec. | |
| 24 * @author Michael Niedermayer <michaelni@gmx.at> | |
| 25 */ | |
| 26 | |
| 27 #include "common.h" | |
| 28 #include "dsputil.h" | |
| 29 #include "avcodec.h" | |
| 30 #include "mpegvideo.h" | |
| 31 #include "h264data.h" | |
| 32 #include "golomb.h" | |
| 33 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
34 #include "cabac.h" |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
35 |
| 1168 | 36 #undef NDEBUG |
| 37 #include <assert.h> | |
| 38 | |
| 39 #define interlaced_dct interlaced_dct_is_a_bad_name | |
| 40 #define mb_intra mb_intra_isnt_initalized_see_mb_type | |
| 41 | |
| 42 #define LUMA_DC_BLOCK_INDEX 25 | |
| 43 #define CHROMA_DC_BLOCK_INDEX 26 | |
| 44 | |
| 45 #define CHROMA_DC_COEFF_TOKEN_VLC_BITS 8 | |
| 46 #define COEFF_TOKEN_VLC_BITS 8 | |
| 47 #define TOTAL_ZEROS_VLC_BITS 9 | |
| 48 #define CHROMA_DC_TOTAL_ZEROS_VLC_BITS 3 | |
| 49 #define RUN_VLC_BITS 3 | |
| 50 #define RUN7_VLC_BITS 6 | |
| 51 | |
| 52 #define MAX_SPS_COUNT 32 | |
| 53 #define MAX_PPS_COUNT 256 | |
| 54 | |
| 55 #define MAX_MMCO_COUNT 66 | |
| 56 | |
| 57 /** | |
| 58 * Sequence parameter set | |
| 59 */ | |
| 60 typedef struct SPS{ | |
| 61 | |
| 62 int profile_idc; | |
| 63 int level_idc; | |
| 64 int log2_max_frame_num; ///< log2_max_frame_num_minus4 + 4 | |
| 65 int poc_type; ///< pic_order_cnt_type | |
| 66 int log2_max_poc_lsb; ///< log2_max_pic_order_cnt_lsb_minus4 | |
| 67 int delta_pic_order_always_zero_flag; | |
| 68 int offset_for_non_ref_pic; | |
| 69 int offset_for_top_to_bottom_field; | |
| 70 int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle | |
| 71 int ref_frame_count; ///< num_ref_frames | |
| 1371 | 72 int gaps_in_frame_num_allowed_flag; |
| 1168 | 73 int mb_width; ///< frame_width_in_mbs_minus1 + 1 |
| 74 int mb_height; ///< frame_height_in_mbs_minus1 + 1 | |
| 75 int frame_mbs_only_flag; | |
| 76 int mb_aff; ///<mb_adaptive_frame_field_flag | |
| 77 int direct_8x8_inference_flag; | |
| 1371 | 78 int crop; ///< frame_cropping_flag |
| 79 int crop_left; ///< frame_cropping_rect_left_offset | |
| 80 int crop_right; ///< frame_cropping_rect_right_offset | |
| 81 int crop_top; ///< frame_cropping_rect_top_offset | |
| 82 int crop_bottom; ///< frame_cropping_rect_bottom_offset | |
| 1168 | 83 int vui_parameters_present_flag; |
| 1548 | 84 AVRational sar; |
|
2174
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
85 int timing_info_present_flag; |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
86 uint32_t num_units_in_tick; |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
87 uint32_t time_scale; |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
88 int fixed_frame_rate_flag; |
| 1168 | 89 short offset_for_ref_frame[256]; //FIXME dyn aloc? |
| 90 }SPS; | |
| 91 | |
| 92 /** | |
| 93 * Picture parameter set | |
| 94 */ | |
| 95 typedef struct PPS{ | |
| 96 int sps_id; | |
| 97 int cabac; ///< entropy_coding_mode_flag | |
| 98 int pic_order_present; ///< pic_order_present_flag | |
| 99 int slice_group_count; ///< num_slice_groups_minus1 + 1 | |
| 100 int mb_slice_group_map_type; | |
| 101 int ref_count[2]; ///< num_ref_idx_l0/1_active_minus1 + 1 | |
| 102 int weighted_pred; ///< weighted_pred_flag | |
| 103 int weighted_bipred_idc; | |
| 104 int init_qp; ///< pic_init_qp_minus26 + 26 | |
| 105 int init_qs; ///< pic_init_qs_minus26 + 26 | |
| 106 int chroma_qp_index_offset; | |
| 107 int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag | |
| 108 int constrained_intra_pred; ///< constrained_intra_pred_flag | |
| 109 int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag | |
| 110 }PPS; | |
| 111 | |
| 112 /** | |
| 113 * Memory management control operation opcode. | |
| 114 */ | |
| 115 typedef enum MMCOOpcode{ | |
| 116 MMCO_END=0, | |
| 117 MMCO_SHORT2UNUSED, | |
| 118 MMCO_LONG2UNUSED, | |
| 119 MMCO_SHORT2LONG, | |
| 120 MMCO_SET_MAX_LONG, | |
| 121 MMCO_RESET, | |
| 122 MMCO_LONG, | |
| 123 } MMCOOpcode; | |
| 124 | |
| 125 /** | |
| 126 * Memory management control operation. | |
| 127 */ | |
| 128 typedef struct MMCO{ | |
| 129 MMCOOpcode opcode; | |
| 130 int short_frame_num; | |
| 131 int long_index; | |
| 132 } MMCO; | |
| 133 | |
| 134 /** | |
| 135 * H264Context | |
| 136 */ | |
| 137 typedef struct H264Context{ | |
| 138 MpegEncContext s; | |
| 139 int nal_ref_idc; | |
| 140 int nal_unit_type; | |
| 141 #define NAL_SLICE 1 | |
| 142 #define NAL_DPA 2 | |
| 143 #define NAL_DPB 3 | |
| 144 #define NAL_DPC 4 | |
| 145 #define NAL_IDR_SLICE 5 | |
| 146 #define NAL_SEI 6 | |
| 147 #define NAL_SPS 7 | |
| 148 #define NAL_PPS 8 | |
| 149 #define NAL_PICTURE_DELIMITER 9 | |
| 150 #define NAL_FILTER_DATA 10 | |
| 151 uint8_t *rbsp_buffer; | |
| 152 int rbsp_buffer_size; | |
| 153 | |
| 2227 | 154 /** |
| 155 * Used to parse AVC variant of h264 | |
| 156 */ | |
| 157 int is_avc; ///< this flag is != 0 if codec is avc1 | |
| 158 int got_avcC; ///< flag used to parse avcC data only once | |
| 159 int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) | |
| 160 | |
| 1168 | 161 int chroma_qp; //QPc |
| 162 | |
| 163 int prev_mb_skiped; //FIXME remove (IMHO not used) | |
| 164 | |
| 165 //prediction stuff | |
| 166 int chroma_pred_mode; | |
| 167 int intra16x16_pred_mode; | |
| 168 | |
| 169 int8_t intra4x4_pred_mode_cache[5*8]; | |
| 170 int8_t (*intra4x4_pred_mode)[8]; | |
| 171 void (*pred4x4 [9+3])(uint8_t *src, uint8_t *topright, int stride);//FIXME move to dsp? | |
| 172 void (*pred8x8 [4+3])(uint8_t *src, int stride); | |
| 173 void (*pred16x16[4+3])(uint8_t *src, int stride); | |
| 174 unsigned int topleft_samples_available; | |
| 175 unsigned int top_samples_available; | |
| 176 unsigned int topright_samples_available; | |
| 177 unsigned int left_samples_available; | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
178 uint8_t (*top_border)[16+2*8]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
179 uint8_t left_border[17+2*9]; |
| 1168 | 180 |
| 181 /** | |
| 182 * non zero coeff count cache. | |
| 183 * is 64 if not available. | |
| 184 */ | |
| 185 uint8_t non_zero_count_cache[6*8]; | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
186 uint8_t (*non_zero_count)[16]; |
| 1168 | 187 |
| 188 /** | |
| 189 * Motion vector cache. | |
| 190 */ | |
| 191 int16_t mv_cache[2][5*8][2]; | |
| 192 int8_t ref_cache[2][5*8]; | |
| 193 #define LIST_NOT_USED -1 //FIXME rename? | |
| 194 #define PART_NOT_AVAILABLE -2 | |
| 195 | |
| 196 /** | |
| 197 * is 1 if the specific list MV&references are set to 0,0,-2. | |
| 198 */ | |
| 199 int mv_cache_clean[2]; | |
| 200 | |
| 201 int block_offset[16+8]; | |
| 202 int chroma_subblock_offset[16]; //FIXME remove | |
| 203 | |
| 204 uint16_t *mb2b_xy; //FIXME are these 4 a good idea? | |
| 205 uint16_t *mb2b8_xy; | |
| 206 int b_stride; | |
| 207 int b8_stride; | |
| 208 | |
| 1234 | 209 int halfpel_flag; |
| 210 int thirdpel_flag; | |
| 211 | |
| 1319 | 212 int unknown_svq3_flag; |
| 213 int next_slice_index; | |
| 214 | |
| 1168 | 215 SPS sps_buffer[MAX_SPS_COUNT]; |
| 216 SPS sps; ///< current sps | |
| 217 | |
| 218 PPS pps_buffer[MAX_PPS_COUNT]; | |
| 219 /** | |
| 220 * current pps | |
| 221 */ | |
| 222 PPS pps; //FIXME move tp Picture perhaps? (->no) do we need that? | |
| 223 | |
| 224 int slice_num; | |
| 225 uint8_t *slice_table_base; | |
| 226 uint8_t *slice_table; ///< slice_table_base + mb_stride + 1 | |
| 227 int slice_type; | |
| 228 int slice_type_fixed; | |
| 229 | |
| 230 //interlacing specific flags | |
| 231 int mb_field_decoding_flag; | |
| 232 | |
| 233 int sub_mb_type[4]; | |
| 234 | |
| 235 //POC stuff | |
| 236 int poc_lsb; | |
| 237 int poc_msb; | |
| 238 int delta_poc_bottom; | |
| 239 int delta_poc[2]; | |
| 240 int frame_num; | |
| 241 int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0 | |
| 242 int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0 | |
| 243 int frame_num_offset; ///< for POC type 2 | |
| 244 int prev_frame_num_offset; ///< for POC type 2 | |
| 245 int prev_frame_num; ///< frame_num of the last pic for POC type 1/2 | |
| 246 | |
| 247 /** | |
| 248 * frame_num for frames or 2*frame_num for field pics. | |
| 249 */ | |
| 250 int curr_pic_num; | |
| 251 | |
| 252 /** | |
| 253 * max_frame_num or 2*max_frame_num for field pics. | |
| 254 */ | |
| 255 int max_pic_num; | |
| 256 | |
| 257 //Weighted pred stuff | |
| 258 int luma_log2_weight_denom; | |
| 259 int chroma_log2_weight_denom; | |
| 260 int luma_weight[2][16]; | |
| 261 int luma_offset[2][16]; | |
| 262 int chroma_weight[2][16][2]; | |
| 263 int chroma_offset[2][16][2]; | |
| 264 | |
| 265 //deblock | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
266 int deblocking_filter; ///< disable_deblocking_filter_idc with 1<->0 |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
267 int slice_alpha_c0_offset; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
268 int slice_beta_offset; |
| 1168 | 269 |
| 270 int redundant_pic_count; | |
| 271 | |
| 272 int direct_spatial_mv_pred; | |
| 273 | |
| 274 /** | |
| 275 * num_ref_idx_l0/1_active_minus1 + 1 | |
| 276 */ | |
| 277 int ref_count[2];// FIXME split for AFF | |
| 278 Picture *short_ref[16]; | |
| 279 Picture *long_ref[16]; | |
| 280 Picture default_ref_list[2][32]; | |
| 281 Picture ref_list[2][32]; //FIXME size? | |
| 282 Picture field_ref_list[2][32]; //FIXME size? | |
| 283 | |
| 284 /** | |
| 285 * memory management control operations buffer. | |
| 286 */ | |
| 287 MMCO mmco[MAX_MMCO_COUNT]; | |
| 288 int mmco_index; | |
| 289 | |
| 290 int long_ref_count; ///< number of actual long term references | |
| 291 int short_ref_count; ///< number of actual short term references | |
| 292 | |
| 293 //data partitioning | |
| 294 GetBitContext intra_gb; | |
| 295 GetBitContext inter_gb; | |
| 296 GetBitContext *intra_gb_ptr; | |
| 297 GetBitContext *inter_gb_ptr; | |
| 298 | |
| 299 DCTELEM mb[16*24] __align8; | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
300 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
301 /** |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
302 * Cabac |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
303 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
304 CABACContext cabac; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
305 uint8_t cabac_state[399]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
306 int cabac_init_idc; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
307 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
308 /* 0x100 -> non null luma_dc, 0x80/0x40 -> non null chroma_dc (cb/cr), 0x?0 -> chroma_cbp(0,1,2), 0x0? luma_cbp */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
309 uint16_t *cbp_table; |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
310 /* chroma_pred_mode for i4x4 or i16x16, else 0 */ |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
311 uint8_t *chroma_pred_mode_table; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
312 int last_qscale_diff; |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
313 int16_t (*mvd_table[2])[2]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
314 int16_t mvd_cache[2][5*8][2]; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
315 |
| 1168 | 316 }H264Context; |
| 317 | |
| 318 static VLC coeff_token_vlc[4]; | |
| 319 static VLC chroma_dc_coeff_token_vlc; | |
| 320 | |
| 321 static VLC total_zeros_vlc[15]; | |
| 322 static VLC chroma_dc_total_zeros_vlc[3]; | |
| 323 | |
| 324 static VLC run_vlc[6]; | |
| 325 static VLC run7_vlc; | |
| 326 | |
| 1234 | 327 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); |
| 328 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc); | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
329 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr); |
| 1234 | 330 |
| 1269 | 331 static inline uint32_t pack16to32(int a, int b){ |
| 332 #ifdef WORDS_BIGENDIAN | |
| 333 return (b&0xFFFF) + (a<<16); | |
| 334 #else | |
| 335 return (a&0xFFFF) + (b<<16); | |
| 336 #endif | |
| 337 } | |
| 338 | |
| 1168 | 339 /** |
| 340 * fill a rectangle. | |
| 341 * @param h height of the recatangle, should be a constant | |
| 342 * @param w width of the recatangle, should be a constant | |
| 343 * @param size the size of val (1 or 4), should be a constant | |
| 344 */ | |
| 1187 | 345 static inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){ //FIXME ensure this IS inlined |
| 346 uint8_t *p= (uint8_t*)vp; | |
| 1168 | 347 assert(size==1 || size==4); |
| 348 | |
| 349 w *= size; | |
| 350 stride *= size; | |
| 351 | |
| 352 //FIXME check what gcc generates for 64 bit on x86 and possible write a 32 bit ver of it | |
| 353 if(w==2 && h==2){ | |
| 354 *(uint16_t*)(p + 0)= | |
| 355 *(uint16_t*)(p + stride)= size==4 ? val : val*0x0101; | |
| 356 }else if(w==2 && h==4){ | |
| 357 *(uint16_t*)(p + 0*stride)= | |
| 358 *(uint16_t*)(p + 1*stride)= | |
| 359 *(uint16_t*)(p + 2*stride)= | |
| 360 *(uint16_t*)(p + 3*stride)= size==4 ? val : val*0x0101; | |
| 1252 | 361 }else if(w==4 && h==1){ |
| 362 *(uint32_t*)(p + 0*stride)= size==4 ? val : val*0x01010101; | |
| 1168 | 363 }else if(w==4 && h==2){ |
| 364 *(uint32_t*)(p + 0*stride)= | |
| 365 *(uint32_t*)(p + 1*stride)= size==4 ? val : val*0x01010101; | |
| 366 }else if(w==4 && h==4){ | |
| 367 *(uint32_t*)(p + 0*stride)= | |
| 368 *(uint32_t*)(p + 1*stride)= | |
| 369 *(uint32_t*)(p + 2*stride)= | |
| 370 *(uint32_t*)(p + 3*stride)= size==4 ? val : val*0x01010101; | |
| 371 }else if(w==8 && h==1){ | |
| 372 *(uint32_t*)(p + 0)= | |
| 373 *(uint32_t*)(p + 4)= size==4 ? val : val*0x01010101; | |
| 374 }else if(w==8 && h==2){ | |
| 375 *(uint32_t*)(p + 0 + 0*stride)= | |
| 376 *(uint32_t*)(p + 4 + 0*stride)= | |
| 377 *(uint32_t*)(p + 0 + 1*stride)= | |
| 378 *(uint32_t*)(p + 4 + 1*stride)= size==4 ? val : val*0x01010101; | |
| 379 }else if(w==8 && h==4){ | |
| 380 *(uint64_t*)(p + 0*stride)= | |
| 381 *(uint64_t*)(p + 1*stride)= | |
| 382 *(uint64_t*)(p + 2*stride)= | |
| 383 *(uint64_t*)(p + 3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
| 384 }else if(w==16 && h==2){ | |
| 385 *(uint64_t*)(p + 0+0*stride)= | |
| 386 *(uint64_t*)(p + 8+0*stride)= | |
| 387 *(uint64_t*)(p + 0+1*stride)= | |
| 388 *(uint64_t*)(p + 8+1*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
| 389 }else if(w==16 && h==4){ | |
| 390 *(uint64_t*)(p + 0+0*stride)= | |
| 391 *(uint64_t*)(p + 8+0*stride)= | |
| 392 *(uint64_t*)(p + 0+1*stride)= | |
| 393 *(uint64_t*)(p + 8+1*stride)= | |
| 394 *(uint64_t*)(p + 0+2*stride)= | |
| 395 *(uint64_t*)(p + 8+2*stride)= | |
| 396 *(uint64_t*)(p + 0+3*stride)= | |
| 397 *(uint64_t*)(p + 8+3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
| 398 }else | |
| 399 assert(0); | |
| 400 } | |
| 401 | |
| 402 static inline void fill_caches(H264Context *h, int mb_type){ | |
| 403 MpegEncContext * const s = &h->s; | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
404 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 405 int topleft_xy, top_xy, topright_xy, left_xy[2]; |
| 406 int topleft_type, top_type, topright_type, left_type[2]; | |
| 407 int left_block[4]; | |
| 408 int i; | |
| 409 | |
| 410 //wow what a mess, why didnt they simplify the interlacing&intra stuff, i cant imagine that these complex rules are worth it | |
| 411 | |
| 412 if(h->sps.mb_aff){ | |
| 413 //FIXME | |
| 1453 | 414 topleft_xy = 0; /* avoid warning */ |
| 415 top_xy = 0; /* avoid warning */ | |
| 416 topright_xy = 0; /* avoid warning */ | |
| 1168 | 417 }else{ |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
418 topleft_xy = mb_xy-1 - s->mb_stride; |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
419 top_xy = mb_xy - s->mb_stride; |
|
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
420 topright_xy= mb_xy+1 - s->mb_stride; |
| 1168 | 421 left_xy[0] = mb_xy-1; |
| 422 left_xy[1] = mb_xy-1; | |
| 423 left_block[0]= 0; | |
| 424 left_block[1]= 1; | |
| 425 left_block[2]= 2; | |
| 426 left_block[3]= 3; | |
| 427 } | |
| 428 | |
| 429 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0; | |
| 430 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0; | |
| 431 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0; | |
| 432 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0; | |
| 433 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0; | |
| 434 | |
| 435 if(IS_INTRA(mb_type)){ | |
| 436 h->topleft_samples_available= | |
| 437 h->top_samples_available= | |
| 438 h->left_samples_available= 0xFFFF; | |
| 439 h->topright_samples_available= 0xEEEA; | |
| 440 | |
| 441 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){ | |
| 442 h->topleft_samples_available= 0xB3FF; | |
| 443 h->top_samples_available= 0x33FF; | |
| 444 h->topright_samples_available= 0x26EA; | |
| 445 } | |
| 446 for(i=0; i<2; i++){ | |
| 447 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){ | |
| 448 h->topleft_samples_available&= 0xDF5F; | |
| 449 h->left_samples_available&= 0x5F5F; | |
| 450 } | |
| 451 } | |
| 452 | |
| 453 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred)) | |
| 454 h->topleft_samples_available&= 0x7FFF; | |
| 455 | |
| 456 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred)) | |
| 457 h->topright_samples_available&= 0xFBFF; | |
| 458 | |
| 459 if(IS_INTRA4x4(mb_type)){ | |
| 460 if(IS_INTRA4x4(top_type)){ | |
| 461 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4]; | |
| 462 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5]; | |
| 463 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6]; | |
| 464 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3]; | |
| 465 }else{ | |
| 466 int pred; | |
| 467 if(IS_INTRA16x16(top_type) || (IS_INTER(top_type) && !h->pps.constrained_intra_pred)) | |
| 468 pred= 2; | |
| 469 else{ | |
| 470 pred= -1; | |
| 471 } | |
| 472 h->intra4x4_pred_mode_cache[4+8*0]= | |
| 473 h->intra4x4_pred_mode_cache[5+8*0]= | |
| 474 h->intra4x4_pred_mode_cache[6+8*0]= | |
| 475 h->intra4x4_pred_mode_cache[7+8*0]= pred; | |
| 476 } | |
| 477 for(i=0; i<2; i++){ | |
| 478 if(IS_INTRA4x4(left_type[i])){ | |
| 479 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[0+2*i]]; | |
| 480 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[1+2*i]]; | |
| 481 }else{ | |
| 482 int pred; | |
| 483 if(IS_INTRA16x16(left_type[i]) || (IS_INTER(left_type[i]) && !h->pps.constrained_intra_pred)) | |
| 484 pred= 2; | |
| 485 else{ | |
| 486 pred= -1; | |
| 487 } | |
| 488 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= | |
| 489 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred; | |
| 490 } | |
| 491 } | |
| 492 } | |
| 493 } | |
| 494 | |
| 495 | |
| 496 /* | |
| 497 0 . T T. T T T T | |
| 498 1 L . .L . . . . | |
| 499 2 L . .L . . . . | |
| 500 3 . T TL . . . . | |
| 501 4 L . .L . . . . | |
| 502 5 L . .. . . . . | |
| 503 */ | |
| 504 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec) | |
| 505 if(top_type){ | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
506 h->non_zero_count_cache[4+8*0]= h->non_zero_count[top_xy][0]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
507 h->non_zero_count_cache[5+8*0]= h->non_zero_count[top_xy][1]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
508 h->non_zero_count_cache[6+8*0]= h->non_zero_count[top_xy][2]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
509 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3]; |
| 1168 | 510 |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
511 h->non_zero_count_cache[1+8*0]= h->non_zero_count[top_xy][7]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
512 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8]; |
| 1168 | 513 |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
514 h->non_zero_count_cache[1+8*3]= h->non_zero_count[top_xy][10]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
515 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11]; |
| 1168 | 516 }else{ |
| 517 h->non_zero_count_cache[4+8*0]= | |
| 518 h->non_zero_count_cache[5+8*0]= | |
| 519 h->non_zero_count_cache[6+8*0]= | |
| 520 h->non_zero_count_cache[7+8*0]= | |
| 521 | |
| 522 h->non_zero_count_cache[1+8*0]= | |
| 523 h->non_zero_count_cache[2+8*0]= | |
| 524 | |
| 525 h->non_zero_count_cache[1+8*3]= | |
| 526 h->non_zero_count_cache[2+8*3]= 64; | |
| 527 } | |
| 528 | |
| 529 if(left_type[0]){ | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
530 h->non_zero_count_cache[3+8*1]= h->non_zero_count[left_xy[0]][6]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
531 h->non_zero_count_cache[3+8*2]= h->non_zero_count[left_xy[0]][5]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
532 h->non_zero_count_cache[0+8*1]= h->non_zero_count[left_xy[0]][9]; //FIXME left_block |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
533 h->non_zero_count_cache[0+8*4]= h->non_zero_count[left_xy[0]][12]; |
| 1168 | 534 }else{ |
| 535 h->non_zero_count_cache[3+8*1]= | |
| 536 h->non_zero_count_cache[3+8*2]= | |
| 537 h->non_zero_count_cache[0+8*1]= | |
| 538 h->non_zero_count_cache[0+8*4]= 64; | |
| 539 } | |
| 540 | |
| 541 if(left_type[1]){ | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
542 h->non_zero_count_cache[3+8*3]= h->non_zero_count[left_xy[1]][4]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
543 h->non_zero_count_cache[3+8*4]= h->non_zero_count[left_xy[1]][3]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
544 h->non_zero_count_cache[0+8*2]= h->non_zero_count[left_xy[1]][8]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
545 h->non_zero_count_cache[0+8*5]= h->non_zero_count[left_xy[1]][11]; |
| 1168 | 546 }else{ |
| 547 h->non_zero_count_cache[3+8*3]= | |
| 548 h->non_zero_count_cache[3+8*4]= | |
| 549 h->non_zero_count_cache[0+8*2]= | |
| 550 h->non_zero_count_cache[0+8*5]= 64; | |
| 551 } | |
| 552 | |
| 553 #if 1 | |
| 554 if(IS_INTER(mb_type)){ | |
| 555 int list; | |
| 556 for(list=0; list<2; list++){ | |
| 557 if((!IS_8X8(mb_type)) && !USES_LIST(mb_type, list)){ | |
| 558 /*if(!h->mv_cache_clean[list]){ | |
| 559 memset(h->mv_cache [list], 0, 8*5*2*sizeof(int16_t)); //FIXME clean only input? clean at all? | |
| 560 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t)); | |
| 561 h->mv_cache_clean[list]= 1; | |
| 562 }*/ | |
| 563 continue; //FIXME direct mode ... | |
| 564 } | |
| 565 h->mv_cache_clean[list]= 0; | |
| 566 | |
| 567 if(IS_INTER(topleft_type)){ | |
| 568 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride; | |
| 569 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride; | |
| 570 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; | |
| 571 h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy]; | |
| 572 }else{ | |
| 573 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= 0; | |
| 574 h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
| 575 } | |
| 576 | |
| 577 if(IS_INTER(top_type)){ | |
| 578 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; | |
| 579 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride; | |
| 580 *(uint32_t*)h->mv_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 0]; | |
| 581 *(uint32_t*)h->mv_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 1]; | |
| 582 *(uint32_t*)h->mv_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 2]; | |
| 583 *(uint32_t*)h->mv_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 3]; | |
| 584 h->ref_cache[list][scan8[0] + 0 - 1*8]= | |
| 585 h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][b8_xy + 0]; | |
| 586 h->ref_cache[list][scan8[0] + 2 - 1*8]= | |
| 587 h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][b8_xy + 1]; | |
| 588 }else{ | |
| 589 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]= | |
| 590 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]= | |
| 591 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]= | |
| 592 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0; | |
| 593 *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101; | |
| 594 } | |
| 595 | |
| 596 if(IS_INTER(topright_type)){ | |
| 597 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride; | |
| 598 const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride; | |
| 599 *(uint32_t*)h->mv_cache[list][scan8[0] + 4 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; | |
| 600 h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][b8_xy]; | |
| 601 }else{ | |
| 602 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0; | |
| 603 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
| 604 } | |
| 605 | |
| 606 //FIXME unify cleanup or sth | |
| 607 if(IS_INTER(left_type[0])){ | |
| 608 const int b_xy= h->mb2b_xy[left_xy[0]] + 3; | |
| 609 const int b8_xy= h->mb2b8_xy[left_xy[0]] + 1; | |
| 610 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 + 0*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[0]]; | |
| 611 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 + 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[1]]; | |
| 612 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
| 613 h->ref_cache[list][scan8[0] - 1 + 1*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0]>>1)]; | |
| 614 }else{ | |
| 615 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 0*8]= | |
| 616 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 1*8]= 0; | |
| 617 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
| 618 h->ref_cache[list][scan8[0] - 1 + 1*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
| 619 } | |
| 620 | |
| 621 if(IS_INTER(left_type[1])){ | |
| 622 const int b_xy= h->mb2b_xy[left_xy[1]] + 3; | |
| 623 const int b8_xy= h->mb2b8_xy[left_xy[1]] + 1; | |
| 624 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 + 2*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[2]]; | |
| 625 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 + 3*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[3]]; | |
| 626 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
| 627 h->ref_cache[list][scan8[0] - 1 + 3*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[2]>>1)]; | |
| 628 }else{ | |
| 629 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 2*8]= | |
| 630 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 3*8]= 0; | |
| 631 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
| 632 h->ref_cache[list][scan8[0] - 1 + 3*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
| 633 } | |
| 634 | |
| 635 h->ref_cache[list][scan8[5 ]+1] = | |
| 636 h->ref_cache[list][scan8[7 ]+1] = | |
| 637 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewher else) | |
| 638 h->ref_cache[list][scan8[4 ]] = | |
| 639 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; | |
| 640 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]= | |
| 641 *(uint32_t*)h->mv_cache [list][scan8[7 ]+1]= | |
| 642 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewher else) | |
| 643 *(uint32_t*)h->mv_cache [list][scan8[4 ]]= | |
| 644 *(uint32_t*)h->mv_cache [list][scan8[12]]= 0; | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
645 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
646 if( h->pps.cabac ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
647 /* XXX beurk, Load mvd */ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
648 if(IS_INTER(topleft_type)){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
649 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
650 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
651 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
652 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 - 1*8]= 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
653 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
654 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
655 if(IS_INTER(top_type)){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
656 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
657 *(uint32_t*)h->mvd_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 0]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
658 *(uint32_t*)h->mvd_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 1]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
659 *(uint32_t*)h->mvd_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 2]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
660 *(uint32_t*)h->mvd_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 3]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
661 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
662 *(uint32_t*)h->mvd_cache [list][scan8[0] + 0 - 1*8]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
663 *(uint32_t*)h->mvd_cache [list][scan8[0] + 1 - 1*8]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
664 *(uint32_t*)h->mvd_cache [list][scan8[0] + 2 - 1*8]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
665 *(uint32_t*)h->mvd_cache [list][scan8[0] + 3 - 1*8]= 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
666 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
667 if(IS_INTER(left_type[0])){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
668 const int b_xy= h->mb2b_xy[left_xy[0]] + 3; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
669 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 0*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[0]]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
670 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[1]]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
671 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
672 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 0*8]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
673 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 1*8]= 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
674 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
675 if(IS_INTER(left_type[1])){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
676 const int b_xy= h->mb2b_xy[left_xy[1]] + 3; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
677 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 2*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[2]]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
678 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 3*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[3]]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
679 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
680 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 2*8]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
681 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 3*8]= 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
682 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
683 *(uint32_t*)h->mvd_cache [list][scan8[5 ]+1]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
684 *(uint32_t*)h->mvd_cache [list][scan8[7 ]+1]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
685 *(uint32_t*)h->mvd_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewher else) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
686 *(uint32_t*)h->mvd_cache [list][scan8[4 ]]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
687 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
688 } |
| 1168 | 689 } |
| 690 //FIXME | |
| 691 } | |
| 692 #endif | |
| 693 } | |
| 694 | |
| 695 static inline void write_back_intra_pred_mode(H264Context *h){ | |
| 696 MpegEncContext * const s = &h->s; | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
697 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 698 |
| 699 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1]; | |
| 700 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2]; | |
| 701 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3]; | |
| 702 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4]; | |
| 703 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4]; | |
| 704 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4]; | |
| 705 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4]; | |
| 706 } | |
| 707 | |
| 708 /** | |
| 709 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
| 710 */ | |
| 711 static inline int check_intra4x4_pred_mode(H264Context *h){ | |
| 712 MpegEncContext * const s = &h->s; | |
| 713 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0}; | |
| 714 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED}; | |
| 715 int i; | |
| 716 | |
| 717 if(!(h->top_samples_available&0x8000)){ | |
| 718 for(i=0; i<4; i++){ | |
| 719 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ]; | |
| 720 if(status<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
721 av_log(h->s.avctx, AV_LOG_ERROR, "top block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y); |
| 1168 | 722 return -1; |
| 723 } else if(status){ | |
| 724 h->intra4x4_pred_mode_cache[scan8[0] + i]= status; | |
| 725 } | |
| 726 } | |
| 727 } | |
| 728 | |
| 729 if(!(h->left_samples_available&0x8000)){ | |
| 730 for(i=0; i<4; i++){ | |
| 731 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ]; | |
| 732 if(status<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
733 av_log(h->s.avctx, AV_LOG_ERROR, "left block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y); |
| 1168 | 734 return -1; |
| 735 } else if(status){ | |
| 736 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status; | |
| 737 } | |
| 738 } | |
| 739 } | |
| 740 | |
| 741 return 0; | |
| 742 } //FIXME cleanup like next | |
| 743 | |
| 744 /** | |
| 745 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
| 746 */ | |
| 747 static inline int check_intra_pred_mode(H264Context *h, int mode){ | |
| 748 MpegEncContext * const s = &h->s; | |
| 749 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1}; | |
| 750 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8}; | |
| 751 | |
| 2163 | 752 if(mode < 0 || mode > 6) |
| 753 return -1; | |
| 754 | |
| 1168 | 755 if(!(h->top_samples_available&0x8000)){ |
| 756 mode= top[ mode ]; | |
| 757 if(mode<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
758 av_log(h->s.avctx, AV_LOG_ERROR, "top block unavailable for requested intra mode at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 759 return -1; |
| 760 } | |
| 761 } | |
| 762 | |
| 763 if(!(h->left_samples_available&0x8000)){ | |
| 764 mode= left[ mode ]; | |
| 765 if(mode<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
766 av_log(h->s.avctx, AV_LOG_ERROR, "left block unavailable for requested intra mode at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 767 return -1; |
| 768 } | |
| 769 } | |
| 770 | |
| 771 return mode; | |
| 772 } | |
| 773 | |
| 774 /** | |
| 775 * gets the predicted intra4x4 prediction mode. | |
| 776 */ | |
| 777 static inline int pred_intra_mode(H264Context *h, int n){ | |
| 778 const int index8= scan8[n]; | |
| 779 const int left= h->intra4x4_pred_mode_cache[index8 - 1]; | |
| 780 const int top = h->intra4x4_pred_mode_cache[index8 - 8]; | |
| 781 const int min= FFMIN(left, top); | |
| 782 | |
| 1170 | 783 tprintf("mode:%d %d min:%d\n", left ,top, min); |
| 1168 | 784 |
| 785 if(min<0) return DC_PRED; | |
| 786 else return min; | |
| 787 } | |
| 788 | |
| 789 static inline void write_back_non_zero_count(H264Context *h){ | |
| 790 MpegEncContext * const s = &h->s; | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
791 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
792 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
793 h->non_zero_count[mb_xy][0]= h->non_zero_count_cache[4+8*4]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
794 h->non_zero_count[mb_xy][1]= h->non_zero_count_cache[5+8*4]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
795 h->non_zero_count[mb_xy][2]= h->non_zero_count_cache[6+8*4]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
796 h->non_zero_count[mb_xy][3]= h->non_zero_count_cache[7+8*4]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
797 h->non_zero_count[mb_xy][4]= h->non_zero_count_cache[7+8*3]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
798 h->non_zero_count[mb_xy][5]= h->non_zero_count_cache[7+8*2]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
799 h->non_zero_count[mb_xy][6]= h->non_zero_count_cache[7+8*1]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
800 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
801 h->non_zero_count[mb_xy][7]= h->non_zero_count_cache[1+8*2]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
802 h->non_zero_count[mb_xy][8]= h->non_zero_count_cache[2+8*2]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
803 h->non_zero_count[mb_xy][9]= h->non_zero_count_cache[2+8*1]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
804 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
805 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[1+8*5]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
806 h->non_zero_count[mb_xy][11]=h->non_zero_count_cache[2+8*5]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
807 h->non_zero_count[mb_xy][12]=h->non_zero_count_cache[2+8*4]; |
| 1168 | 808 } |
| 809 | |
| 810 /** | |
| 811 * gets the predicted number of non zero coefficients. | |
| 812 * @param n block index | |
| 813 */ | |
| 814 static inline int pred_non_zero_count(H264Context *h, int n){ | |
| 815 const int index8= scan8[n]; | |
| 816 const int left= h->non_zero_count_cache[index8 - 1]; | |
| 817 const int top = h->non_zero_count_cache[index8 - 8]; | |
| 818 int i= left + top; | |
| 819 | |
| 820 if(i<64) i= (i+1)>>1; | |
| 821 | |
| 1170 | 822 tprintf("pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31); |
| 1168 | 823 |
| 824 return i&31; | |
| 825 } | |
| 826 | |
| 1169 | 827 static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width){ |
| 828 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ]; | |
| 829 | |
| 830 if(topright_ref != PART_NOT_AVAILABLE){ | |
| 831 *C= h->mv_cache[list][ i - 8 + part_width ]; | |
| 832 return topright_ref; | |
| 833 }else{ | |
| 1170 | 834 tprintf("topright MV not available\n"); |
| 835 | |
| 1169 | 836 *C= h->mv_cache[list][ i - 8 - 1 ]; |
| 837 return h->ref_cache[list][ i - 8 - 1 ]; | |
| 838 } | |
| 839 } | |
| 840 | |
| 1168 | 841 /** |
| 842 * gets the predicted MV. | |
| 843 * @param n the block index | |
| 844 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4) | |
| 845 * @param mx the x component of the predicted motion vector | |
| 846 * @param my the y component of the predicted motion vector | |
| 847 */ | |
| 848 static inline void pred_motion(H264Context * const h, int n, int part_width, int list, int ref, int * const mx, int * const my){ | |
| 849 const int index8= scan8[n]; | |
| 850 const int top_ref= h->ref_cache[list][ index8 - 8 ]; | |
| 851 const int left_ref= h->ref_cache[list][ index8 - 1 ]; | |
| 852 const int16_t * const A= h->mv_cache[list][ index8 - 1 ]; | |
| 853 const int16_t * const B= h->mv_cache[list][ index8 - 8 ]; | |
| 1169 | 854 const int16_t * C; |
| 855 int diagonal_ref, match_count; | |
| 856 | |
| 1168 | 857 assert(part_width==1 || part_width==2 || part_width==4); |
| 1169 | 858 |
| 1168 | 859 /* mv_cache |
| 860 B . . A T T T T | |
| 861 U . . L . . , . | |
| 862 U . . L . . . . | |
| 863 U . . L . . , . | |
| 864 . . . L . . . . | |
| 865 */ | |
| 1169 | 866 |
| 867 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width); | |
| 868 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref); | |
| 869 if(match_count > 1){ //most common | |
| 870 *mx= mid_pred(A[0], B[0], C[0]); | |
| 871 *my= mid_pred(A[1], B[1], C[1]); | |
| 872 }else if(match_count==1){ | |
| 873 if(left_ref==ref){ | |
| 874 *mx= A[0]; | |
| 875 *my= A[1]; | |
| 876 }else if(top_ref==ref){ | |
| 877 *mx= B[0]; | |
| 878 *my= B[1]; | |
| 879 }else{ | |
| 880 *mx= C[0]; | |
| 881 *my= C[1]; | |
| 882 } | |
| 883 }else{ | |
| 884 if(top_ref == PART_NOT_AVAILABLE && diagonal_ref == PART_NOT_AVAILABLE && left_ref != PART_NOT_AVAILABLE){ | |
| 885 *mx= A[0]; | |
| 886 *my= A[1]; | |
| 1168 | 887 }else{ |
| 888 *mx= mid_pred(A[0], B[0], C[0]); | |
| 889 *my= mid_pred(A[1], B[1], C[1]); | |
| 890 } | |
| 1169 | 891 } |
| 1168 | 892 |
| 1187 | 893 tprintf("pred_motion (%2d %2d %2d) (%2d %2d %2d) (%2d %2d %2d) -> (%2d %2d %2d) at %2d %2d %d list %d\n", top_ref, B[0], B[1], diagonal_ref, C[0], C[1], left_ref, A[0], A[1], ref, *mx, *my, h->s.mb_x, h->s.mb_y, n, list); |
| 1168 | 894 } |
| 895 | |
| 896 /** | |
| 897 * gets the directionally predicted 16x8 MV. | |
| 898 * @param n the block index | |
| 899 * @param mx the x component of the predicted motion vector | |
| 900 * @param my the y component of the predicted motion vector | |
| 901 */ | |
| 902 static inline void pred_16x8_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
| 903 if(n==0){ | |
| 904 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ]; | |
| 905 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ]; | |
| 906 | |
| 1187 | 907 tprintf("pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d", top_ref, B[0], B[1], h->s.mb_x, h->s.mb_y, n, list); |
| 1168 | 908 |
| 909 if(top_ref == ref){ | |
| 910 *mx= B[0]; | |
| 911 *my= B[1]; | |
| 912 return; | |
| 913 } | |
| 914 }else{ | |
| 915 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ]; | |
| 916 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ]; | |
| 917 | |
| 1187 | 918 tprintf("pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list); |
| 1168 | 919 |
| 920 if(left_ref == ref){ | |
| 921 *mx= A[0]; | |
| 922 *my= A[1]; | |
| 923 return; | |
| 924 } | |
| 925 } | |
| 926 | |
| 927 //RARE | |
| 928 pred_motion(h, n, 4, list, ref, mx, my); | |
| 929 } | |
| 930 | |
| 931 /** | |
| 932 * gets the directionally predicted 8x16 MV. | |
| 933 * @param n the block index | |
| 934 * @param mx the x component of the predicted motion vector | |
| 935 * @param my the y component of the predicted motion vector | |
| 936 */ | |
| 937 static inline void pred_8x16_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
| 938 if(n==0){ | |
| 939 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ]; | |
| 940 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ]; | |
| 941 | |
| 1187 | 942 tprintf("pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list); |
| 1168 | 943 |
| 944 if(left_ref == ref){ | |
| 945 *mx= A[0]; | |
| 946 *my= A[1]; | |
| 947 return; | |
| 948 } | |
| 949 }else{ | |
| 1169 | 950 const int16_t * C; |
| 951 int diagonal_ref; | |
| 952 | |
| 953 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2); | |
| 1168 | 954 |
| 1187 | 955 tprintf("pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d", diagonal_ref, C[0], C[1], h->s.mb_x, h->s.mb_y, n, list); |
| 1168 | 956 |
| 1169 | 957 if(diagonal_ref == ref){ |
| 1168 | 958 *mx= C[0]; |
| 959 *my= C[1]; | |
| 960 return; | |
| 961 } | |
| 962 } | |
| 963 | |
| 964 //RARE | |
| 965 pred_motion(h, n, 2, list, ref, mx, my); | |
| 966 } | |
| 967 | |
| 968 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){ | |
| 969 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ]; | |
| 970 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ]; | |
| 971 | |
| 1187 | 972 tprintf("pred_pskip: (%d) (%d) at %2d %2d", top_ref, left_ref, h->s.mb_x, h->s.mb_y); |
| 1168 | 973 |
| 974 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE | |
| 975 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0) | |
| 976 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){ | |
| 977 | |
| 978 *mx = *my = 0; | |
| 979 return; | |
| 980 } | |
| 981 | |
| 982 pred_motion(h, 0, 4, 0, 0, mx, my); | |
| 983 | |
| 984 return; | |
| 985 } | |
| 986 | |
| 987 static inline void write_back_motion(H264Context *h, int mb_type){ | |
| 988 MpegEncContext * const s = &h->s; | |
| 989 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
| 990 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
| 991 int list; | |
| 992 | |
| 993 for(list=0; list<2; list++){ | |
| 994 int y; | |
| 995 if((!IS_8X8(mb_type)) && !USES_LIST(mb_type, list)){ | |
| 996 if(1){ //FIXME skip or never read if mb_type doesnt use it | |
| 997 for(y=0; y<4; y++){ | |
| 998 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]= | |
| 999 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= 0; | |
| 1000 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1001 if( h->pps.cabac ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1002 /* FIXME needed ? */ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1003 for(y=0; y<4; y++){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1004 *(uint64_t*)h->mvd_table[list][b_xy + 0 + y*h->b_stride]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1005 *(uint64_t*)h->mvd_table[list][b_xy + 2 + y*h->b_stride]= 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1006 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1007 } |
| 1168 | 1008 for(y=0; y<2; y++){ |
| 1009 *(uint16_t*)s->current_picture.motion_val[list][b8_xy + y*h->b8_stride]= (LIST_NOT_USED&0xFF)*0x0101; | |
| 1010 } | |
| 1011 } | |
| 1012 continue; //FIXME direct mode ... | |
| 1013 } | |
| 1014 | |
| 1015 for(y=0; y<4; y++){ | |
| 1016 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]= *(uint64_t*)h->mv_cache[list][scan8[0]+0 + 8*y]; | |
| 1017 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mv_cache[list][scan8[0]+2 + 8*y]; | |
| 1018 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1019 if( h->pps.cabac ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1020 for(y=0; y<4; y++){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1021 *(uint64_t*)h->mvd_table[list][b_xy + 0 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+0 + 8*y]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1022 *(uint64_t*)h->mvd_table[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+2 + 8*y]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1023 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1024 } |
| 1168 | 1025 for(y=0; y<2; y++){ |
| 1026 s->current_picture.ref_index[list][b8_xy + 0 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+0 + 16*y]; | |
| 1027 s->current_picture.ref_index[list][b8_xy + 1 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+2 + 16*y]; | |
| 1028 } | |
| 1029 } | |
| 1030 } | |
| 1031 | |
| 1032 /** | |
| 1033 * Decodes a network abstraction layer unit. | |
| 1034 * @param consumed is the number of bytes used as input | |
| 1035 * @param length is the length of the array | |
| 1036 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp ttailing? | |
| 1037 * @returns decoded bytes, might be src+1 if no escapes | |
| 1038 */ | |
| 1039 static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *consumed, int length){ | |
| 1040 int i, si, di; | |
| 1041 uint8_t *dst; | |
| 1042 | |
| 1043 // src[0]&0x80; //forbidden bit | |
| 1044 h->nal_ref_idc= src[0]>>5; | |
| 1045 h->nal_unit_type= src[0]&0x1F; | |
| 1046 | |
| 1047 src++; length--; | |
| 1048 #if 0 | |
| 1049 for(i=0; i<length; i++) | |
| 1050 printf("%2X ", src[i]); | |
| 1051 #endif | |
| 1052 for(i=0; i+1<length; i+=2){ | |
| 1053 if(src[i]) continue; | |
| 1054 if(i>0 && src[i-1]==0) i--; | |
| 1055 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
| 1056 if(src[i+2]!=3){ | |
| 1057 /* startcode, so we must be past the end */ | |
| 1058 length=i; | |
| 1059 } | |
| 1060 break; | |
| 1061 } | |
| 1062 } | |
| 1063 | |
| 1064 if(i>=length-1){ //no escaped 0 | |
| 1065 *dst_length= length; | |
| 1066 *consumed= length+1; //+1 for the header | |
| 1067 return src; | |
| 1068 } | |
| 1069 | |
| 1070 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length); | |
| 1071 dst= h->rbsp_buffer; | |
| 1072 | |
| 1073 //printf("deoding esc\n"); | |
| 1074 si=di=0; | |
| 1075 while(si<length){ | |
| 1076 //remove escapes (very rare 1:2^22) | |
| 1077 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
| 1078 if(src[si+2]==3){ //escape | |
| 1079 dst[di++]= 0; | |
| 1080 dst[di++]= 0; | |
| 1081 si+=3; | |
|
1957
54411768fa38
h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1956
diff
changeset
|
1082 continue; |
| 1168 | 1083 }else //next start code |
| 1084 break; | |
| 1085 } | |
| 1086 | |
| 1087 dst[di++]= src[si++]; | |
| 1088 } | |
| 1089 | |
| 1090 *dst_length= di; | |
| 1091 *consumed= si + 1;//+1 for the header | |
| 1092 //FIXME store exact number of bits in the getbitcontext (its needed for decoding) | |
| 1093 return dst; | |
| 1094 } | |
| 1095 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1096 #if 0 |
| 1168 | 1097 /** |
| 1098 * @param src the data which should be escaped | |
| 1099 * @param dst the target buffer, dst+1 == src is allowed as a special case | |
| 1100 * @param length the length of the src data | |
| 1101 * @param dst_length the length of the dst array | |
| 1102 * @returns length of escaped data in bytes or -1 if an error occured | |
| 1103 */ | |
| 1104 static int encode_nal(H264Context *h, uint8_t *dst, uint8_t *src, int length, int dst_length){ | |
| 1105 int i, escape_count, si, di; | |
| 1106 uint8_t *temp; | |
| 1107 | |
| 1108 assert(length>=0); | |
| 1109 assert(dst_length>0); | |
| 1110 | |
| 1111 dst[0]= (h->nal_ref_idc<<5) + h->nal_unit_type; | |
| 1112 | |
| 1113 if(length==0) return 1; | |
| 1114 | |
| 1115 escape_count= 0; | |
| 1116 for(i=0; i<length; i+=2){ | |
| 1117 if(src[i]) continue; | |
| 1118 if(i>0 && src[i-1]==0) | |
| 1119 i--; | |
| 1120 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
| 1121 escape_count++; | |
| 1122 i+=2; | |
| 1123 } | |
| 1124 } | |
| 1125 | |
| 1126 if(escape_count==0){ | |
| 1127 if(dst+1 != src) | |
| 1128 memcpy(dst+1, src, length); | |
| 1129 return length + 1; | |
| 1130 } | |
| 1131 | |
| 1132 if(length + escape_count + 1> dst_length) | |
| 1133 return -1; | |
| 1134 | |
| 1135 //this should be damn rare (hopefully) | |
| 1136 | |
| 1137 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length + escape_count); | |
| 1138 temp= h->rbsp_buffer; | |
| 1139 //printf("encoding esc\n"); | |
| 1140 | |
| 1141 si= 0; | |
| 1142 di= 0; | |
| 1143 while(si < length){ | |
| 1144 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
| 1145 temp[di++]= 0; si++; | |
| 1146 temp[di++]= 0; si++; | |
| 1147 temp[di++]= 3; | |
| 1148 temp[di++]= src[si++]; | |
| 1149 } | |
| 1150 else | |
| 1151 temp[di++]= src[si++]; | |
| 1152 } | |
| 1153 memcpy(dst+1, temp, length+escape_count); | |
| 1154 | |
| 1155 assert(di == length+escape_count); | |
| 1156 | |
| 1157 return di + 1; | |
| 1158 } | |
| 1159 | |
| 1160 /** | |
| 1161 * write 1,10,100,1000,... for alignment, yes its exactly inverse to mpeg4 | |
| 1162 */ | |
| 1163 static void encode_rbsp_trailing(PutBitContext *pb){ | |
| 1164 int length; | |
| 1165 put_bits(pb, 1, 1); | |
| 1786 | 1166 length= (-put_bits_count(pb))&7; |
| 1168 | 1167 if(length) put_bits(pb, length, 0); |
| 1168 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1169 #endif |
| 1168 | 1170 |
| 1171 /** | |
| 1172 * identifies the exact end of the bitstream | |
| 1173 * @return the length of the trailing, or 0 if damaged | |
| 1174 */ | |
| 1175 static int decode_rbsp_trailing(uint8_t *src){ | |
| 1176 int v= *src; | |
| 1177 int r; | |
| 1178 | |
| 1170 | 1179 tprintf("rbsp trailing %X\n", v); |
| 1168 | 1180 |
| 1181 for(r=1; r<9; r++){ | |
| 1182 if(v&1) return r; | |
| 1183 v>>=1; | |
| 1184 } | |
| 1185 return 0; | |
| 1186 } | |
| 1187 | |
| 1188 /** | |
| 1189 * idct tranforms the 16 dc values and dequantize them. | |
| 1190 * @param qp quantization parameter | |
| 1191 */ | |
| 1192 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
| 1193 const int qmul= dequant_coeff[qp][0]; | |
| 1194 #define stride 16 | |
| 1195 int i; | |
| 1196 int temp[16]; //FIXME check if this is a good idea | |
| 1197 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
| 1198 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
| 1199 | |
| 1200 //memset(block, 64, 2*256); | |
| 1201 //return; | |
| 1202 for(i=0; i<4; i++){ | |
| 1203 const int offset= y_offset[i]; | |
| 1204 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
| 1205 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
| 1206 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
| 1207 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
| 1208 | |
| 1209 temp[4*i+0]= z0+z3; | |
| 1210 temp[4*i+1]= z1+z2; | |
| 1211 temp[4*i+2]= z1-z2; | |
| 1212 temp[4*i+3]= z0-z3; | |
| 1213 } | |
| 1214 | |
| 1215 for(i=0; i<4; i++){ | |
| 1216 const int offset= x_offset[i]; | |
| 1217 const int z0= temp[4*0+i] + temp[4*2+i]; | |
| 1218 const int z1= temp[4*0+i] - temp[4*2+i]; | |
| 1219 const int z2= temp[4*1+i] - temp[4*3+i]; | |
| 1220 const int z3= temp[4*1+i] + temp[4*3+i]; | |
| 1221 | |
| 1222 block[stride*0 +offset]= ((z0 + z3)*qmul + 2)>>2; //FIXME think about merging this into decode_resdual | |
| 1223 block[stride*2 +offset]= ((z1 + z2)*qmul + 2)>>2; | |
| 1224 block[stride*8 +offset]= ((z1 - z2)*qmul + 2)>>2; | |
| 1225 block[stride*10+offset]= ((z0 - z3)*qmul + 2)>>2; | |
| 1226 } | |
| 1227 } | |
| 1228 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1229 #if 0 |
| 1168 | 1230 /** |
| 1231 * dct tranforms the 16 dc values. | |
| 1232 * @param qp quantization parameter ??? FIXME | |
| 1233 */ | |
| 1234 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){ | |
| 1235 // const int qmul= dequant_coeff[qp][0]; | |
| 1236 int i; | |
| 1237 int temp[16]; //FIXME check if this is a good idea | |
| 1238 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
| 1239 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
| 1240 | |
| 1241 for(i=0; i<4; i++){ | |
| 1242 const int offset= y_offset[i]; | |
| 1243 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
| 1244 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
| 1245 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
| 1246 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
| 1247 | |
| 1248 temp[4*i+0]= z0+z3; | |
| 1249 temp[4*i+1]= z1+z2; | |
| 1250 temp[4*i+2]= z1-z2; | |
| 1251 temp[4*i+3]= z0-z3; | |
| 1252 } | |
| 1253 | |
| 1254 for(i=0; i<4; i++){ | |
| 1255 const int offset= x_offset[i]; | |
| 1256 const int z0= temp[4*0+i] + temp[4*2+i]; | |
| 1257 const int z1= temp[4*0+i] - temp[4*2+i]; | |
| 1258 const int z2= temp[4*1+i] - temp[4*3+i]; | |
| 1259 const int z3= temp[4*1+i] + temp[4*3+i]; | |
| 1260 | |
| 1261 block[stride*0 +offset]= (z0 + z3)>>1; | |
| 1262 block[stride*2 +offset]= (z1 + z2)>>1; | |
| 1263 block[stride*8 +offset]= (z1 - z2)>>1; | |
| 1264 block[stride*10+offset]= (z0 - z3)>>1; | |
| 1265 } | |
| 1266 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1267 #endif |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1268 |
| 1168 | 1269 #undef xStride |
| 1270 #undef stride | |
| 1271 | |
| 1272 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
| 1273 const int qmul= dequant_coeff[qp][0]; | |
| 1274 const int stride= 16*2; | |
| 1275 const int xStride= 16; | |
| 1276 int a,b,c,d,e; | |
| 1277 | |
| 1278 a= block[stride*0 + xStride*0]; | |
| 1279 b= block[stride*0 + xStride*1]; | |
| 1280 c= block[stride*1 + xStride*0]; | |
| 1281 d= block[stride*1 + xStride*1]; | |
| 1282 | |
| 1283 e= a-b; | |
| 1284 a= a+b; | |
| 1285 b= c-d; | |
| 1286 c= c+d; | |
| 1287 | |
| 1288 block[stride*0 + xStride*0]= ((a+c)*qmul + 0)>>1; | |
| 1289 block[stride*0 + xStride*1]= ((e+b)*qmul + 0)>>1; | |
| 1290 block[stride*1 + xStride*0]= ((a-c)*qmul + 0)>>1; | |
| 1291 block[stride*1 + xStride*1]= ((e-b)*qmul + 0)>>1; | |
| 1292 } | |
| 1293 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1294 #if 0 |
| 1168 | 1295 static void chroma_dc_dct_c(DCTELEM *block){ |
| 1296 const int stride= 16*2; | |
| 1297 const int xStride= 16; | |
| 1298 int a,b,c,d,e; | |
| 1299 | |
| 1300 a= block[stride*0 + xStride*0]; | |
| 1301 b= block[stride*0 + xStride*1]; | |
| 1302 c= block[stride*1 + xStride*0]; | |
| 1303 d= block[stride*1 + xStride*1]; | |
| 1304 | |
| 1305 e= a-b; | |
| 1306 a= a+b; | |
| 1307 b= c-d; | |
| 1308 c= c+d; | |
| 1309 | |
| 1310 block[stride*0 + xStride*0]= (a+c); | |
| 1311 block[stride*0 + xStride*1]= (e+b); | |
| 1312 block[stride*1 + xStride*0]= (a-c); | |
| 1313 block[stride*1 + xStride*1]= (e-b); | |
| 1314 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1315 #endif |
| 1168 | 1316 |
| 1317 /** | |
| 1318 * gets the chroma qp. | |
| 1319 */ | |
| 1320 static inline int get_chroma_qp(H264Context *h, int qscale){ | |
| 1321 | |
| 1322 return chroma_qp[clip(qscale + h->pps.chroma_qp_index_offset, 0, 51)]; | |
| 1323 } | |
| 1324 | |
| 1325 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1326 #if 0 |
| 1168 | 1327 static void h264_diff_dct_c(DCTELEM *block, uint8_t *src1, uint8_t *src2, int stride){ |
| 1328 int i; | |
| 1329 //FIXME try int temp instead of block | |
| 1330 | |
| 1331 for(i=0; i<4; i++){ | |
| 1332 const int d0= src1[0 + i*stride] - src2[0 + i*stride]; | |
| 1333 const int d1= src1[1 + i*stride] - src2[1 + i*stride]; | |
| 1334 const int d2= src1[2 + i*stride] - src2[2 + i*stride]; | |
| 1335 const int d3= src1[3 + i*stride] - src2[3 + i*stride]; | |
| 1336 const int z0= d0 + d3; | |
| 1337 const int z3= d0 - d3; | |
| 1338 const int z1= d1 + d2; | |
| 1339 const int z2= d1 - d2; | |
| 1340 | |
| 1341 block[0 + 4*i]= z0 + z1; | |
| 1342 block[1 + 4*i]= 2*z3 + z2; | |
| 1343 block[2 + 4*i]= z0 - z1; | |
| 1344 block[3 + 4*i]= z3 - 2*z2; | |
| 1345 } | |
| 1346 | |
| 1347 for(i=0; i<4; i++){ | |
| 1348 const int z0= block[0*4 + i] + block[3*4 + i]; | |
| 1349 const int z3= block[0*4 + i] - block[3*4 + i]; | |
| 1350 const int z1= block[1*4 + i] + block[2*4 + i]; | |
| 1351 const int z2= block[1*4 + i] - block[2*4 + i]; | |
| 1352 | |
| 1353 block[0*4 + i]= z0 + z1; | |
| 1354 block[1*4 + i]= 2*z3 + z2; | |
| 1355 block[2*4 + i]= z0 - z1; | |
| 1356 block[3*4 + i]= z3 - 2*z2; | |
| 1357 } | |
| 1358 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1359 #endif |
| 1168 | 1360 |
| 1361 //FIXME need to check that this doesnt overflow signed 32 bit for low qp, iam not sure, its very close | |
| 1362 //FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away) | |
| 1363 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int seperate_dc){ | |
| 1364 int i; | |
| 1365 const int * const quant_table= quant_coeff[qscale]; | |
| 1366 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6; | |
| 1367 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1; | |
| 1368 const unsigned int threshold2= (threshold1<<1); | |
| 1369 int last_non_zero; | |
| 1370 | |
| 1371 if(seperate_dc){ | |
| 1372 if(qscale<=18){ | |
| 1373 //avoid overflows | |
| 1374 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6; | |
| 1375 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1; | |
| 1376 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
| 1377 | |
| 1378 int level= block[0]*quant_coeff[qscale+18][0]; | |
| 1379 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
| 1380 if(level>0){ | |
| 1381 level= (dc_bias + level)>>(QUANT_SHIFT-2); | |
| 1382 block[0]= level; | |
| 1383 }else{ | |
| 1384 level= (dc_bias - level)>>(QUANT_SHIFT-2); | |
| 1385 block[0]= -level; | |
| 1386 } | |
| 1387 // last_non_zero = i; | |
| 1388 }else{ | |
| 1389 block[0]=0; | |
| 1390 } | |
| 1391 }else{ | |
| 1392 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6; | |
| 1393 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1; | |
| 1394 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
| 1395 | |
| 1396 int level= block[0]*quant_table[0]; | |
| 1397 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
| 1398 if(level>0){ | |
| 1399 level= (dc_bias + level)>>(QUANT_SHIFT+1); | |
| 1400 block[0]= level; | |
| 1401 }else{ | |
| 1402 level= (dc_bias - level)>>(QUANT_SHIFT+1); | |
| 1403 block[0]= -level; | |
| 1404 } | |
| 1405 // last_non_zero = i; | |
| 1406 }else{ | |
| 1407 block[0]=0; | |
| 1408 } | |
| 1409 } | |
| 1410 last_non_zero= 0; | |
| 1411 i=1; | |
| 1412 }else{ | |
| 1413 last_non_zero= -1; | |
| 1414 i=0; | |
| 1415 } | |
| 1416 | |
| 1417 for(; i<16; i++){ | |
| 1418 const int j= scantable[i]; | |
| 1419 int level= block[j]*quant_table[j]; | |
| 1420 | |
| 1421 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
| 1422 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
| 1423 if(((unsigned)(level+threshold1))>threshold2){ | |
| 1424 if(level>0){ | |
| 1425 level= (bias + level)>>QUANT_SHIFT; | |
| 1426 block[j]= level; | |
| 1427 }else{ | |
| 1428 level= (bias - level)>>QUANT_SHIFT; | |
| 1429 block[j]= -level; | |
| 1430 } | |
| 1431 last_non_zero = i; | |
| 1432 }else{ | |
| 1433 block[j]=0; | |
| 1434 } | |
| 1435 } | |
| 1436 | |
| 1437 return last_non_zero; | |
| 1438 } | |
| 1439 | |
| 1440 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1441 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 1442 ((uint32_t*)(src+0*stride))[0]= a; | |
| 1443 ((uint32_t*)(src+1*stride))[0]= a; | |
| 1444 ((uint32_t*)(src+2*stride))[0]= a; | |
| 1445 ((uint32_t*)(src+3*stride))[0]= a; | |
| 1446 } | |
| 1447 | |
| 1448 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1449 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101; | |
| 1450 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101; | |
| 1451 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101; | |
| 1452 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101; | |
| 1453 } | |
| 1454 | |
| 1455 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1456 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] | |
| 1457 + src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 4) >>3; | |
| 1458 | |
| 1459 ((uint32_t*)(src+0*stride))[0]= | |
| 1460 ((uint32_t*)(src+1*stride))[0]= | |
| 1461 ((uint32_t*)(src+2*stride))[0]= | |
| 1462 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1463 } | |
| 1464 | |
| 1465 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1466 const int dc= ( src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 2) >>2; | |
| 1467 | |
| 1468 ((uint32_t*)(src+0*stride))[0]= | |
| 1469 ((uint32_t*)(src+1*stride))[0]= | |
| 1470 ((uint32_t*)(src+2*stride))[0]= | |
| 1471 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1472 } | |
| 1473 | |
| 1474 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1475 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2; | |
| 1476 | |
| 1477 ((uint32_t*)(src+0*stride))[0]= | |
| 1478 ((uint32_t*)(src+1*stride))[0]= | |
| 1479 ((uint32_t*)(src+2*stride))[0]= | |
| 1480 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1481 } | |
| 1482 | |
| 1483 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1484 ((uint32_t*)(src+0*stride))[0]= | |
| 1485 ((uint32_t*)(src+1*stride))[0]= | |
| 1486 ((uint32_t*)(src+2*stride))[0]= | |
| 1487 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U; | |
| 1488 } | |
| 1489 | |
| 1490 | |
| 1491 #define LOAD_TOP_RIGHT_EDGE\ | |
| 1492 const int t4= topright[0];\ | |
| 1493 const int t5= topright[1];\ | |
| 1494 const int t6= topright[2];\ | |
| 1495 const int t7= topright[3];\ | |
| 1496 | |
| 1497 #define LOAD_LEFT_EDGE\ | |
| 1498 const int l0= src[-1+0*stride];\ | |
| 1499 const int l1= src[-1+1*stride];\ | |
| 1500 const int l2= src[-1+2*stride];\ | |
| 1501 const int l3= src[-1+3*stride];\ | |
| 1502 | |
| 1503 #define LOAD_TOP_EDGE\ | |
| 1504 const int t0= src[ 0-1*stride];\ | |
| 1505 const int t1= src[ 1-1*stride];\ | |
| 1506 const int t2= src[ 2-1*stride];\ | |
| 1507 const int t3= src[ 3-1*stride];\ | |
| 1508 | |
| 1509 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1510 const int lt= src[-1-1*stride]; | |
| 1511 LOAD_TOP_EDGE | |
| 1512 LOAD_LEFT_EDGE | |
| 1513 | |
| 1514 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2; | |
| 1515 src[0+2*stride]= | |
| 1516 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2; | |
| 1517 src[0+1*stride]= | |
| 1518 src[1+2*stride]= | |
| 1519 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2; | |
| 1520 src[0+0*stride]= | |
| 1521 src[1+1*stride]= | |
| 1522 src[2+2*stride]= | |
| 1523 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1524 src[1+0*stride]= | |
| 1525 src[2+1*stride]= | |
| 1526 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1527 src[2+0*stride]= | |
| 1528 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1529 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1282 | 1530 } |
| 1168 | 1531 |
| 1532 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1533 LOAD_TOP_EDGE | |
| 1534 LOAD_TOP_RIGHT_EDGE | |
| 1535 // LOAD_LEFT_EDGE | |
| 1536 | |
| 1537 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2; | |
| 1538 src[1+0*stride]= | |
| 1539 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2; | |
| 1540 src[2+0*stride]= | |
| 1541 src[1+1*stride]= | |
| 1542 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2; | |
| 1543 src[3+0*stride]= | |
| 1544 src[2+1*stride]= | |
| 1545 src[1+2*stride]= | |
| 1546 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2; | |
| 1547 src[3+1*stride]= | |
| 1548 src[2+2*stride]= | |
| 1549 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2; | |
| 1550 src[3+2*stride]= | |
| 1551 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2; | |
| 1552 src[3+3*stride]=(t6 + 3*t7 + 2)>>2; | |
| 1282 | 1553 } |
| 1168 | 1554 |
| 1555 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1556 const int lt= src[-1-1*stride]; | |
| 1557 LOAD_TOP_EDGE | |
| 1558 LOAD_LEFT_EDGE | |
| 1559 const __attribute__((unused)) int unu= l3; | |
| 1560 | |
| 1561 src[0+0*stride]= | |
| 1562 src[1+2*stride]=(lt + t0 + 1)>>1; | |
| 1563 src[1+0*stride]= | |
| 1564 src[2+2*stride]=(t0 + t1 + 1)>>1; | |
| 1565 src[2+0*stride]= | |
| 1566 src[3+2*stride]=(t1 + t2 + 1)>>1; | |
| 1567 src[3+0*stride]=(t2 + t3 + 1)>>1; | |
| 1568 src[0+1*stride]= | |
| 1569 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1570 src[1+1*stride]= | |
| 1571 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1572 src[2+1*stride]= | |
| 1573 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1574 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1575 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
| 1576 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1282 | 1577 } |
| 1168 | 1578 |
| 1579 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1580 LOAD_TOP_EDGE | |
| 1581 LOAD_TOP_RIGHT_EDGE | |
| 1582 const __attribute__((unused)) int unu= t7; | |
| 1583 | |
| 1584 src[0+0*stride]=(t0 + t1 + 1)>>1; | |
| 1585 src[1+0*stride]= | |
| 1586 src[0+2*stride]=(t1 + t2 + 1)>>1; | |
| 1587 src[2+0*stride]= | |
| 1588 src[1+2*stride]=(t2 + t3 + 1)>>1; | |
| 1589 src[3+0*stride]= | |
| 1590 src[2+2*stride]=(t3 + t4+ 1)>>1; | |
| 1591 src[3+2*stride]=(t4 + t5+ 1)>>1; | |
| 1592 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1593 src[1+1*stride]= | |
| 1594 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1595 src[2+1*stride]= | |
| 1596 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2; | |
| 1597 src[3+1*stride]= | |
| 1598 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; | |
| 1599 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; | |
| 1282 | 1600 } |
| 1168 | 1601 |
| 1602 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1603 LOAD_LEFT_EDGE | |
| 1604 | |
| 1605 src[0+0*stride]=(l0 + l1 + 1)>>1; | |
| 1606 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1607 src[2+0*stride]= | |
| 1608 src[0+1*stride]=(l1 + l2 + 1)>>1; | |
| 1609 src[3+0*stride]= | |
| 1610 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
| 1611 src[2+1*stride]= | |
| 1612 src[0+2*stride]=(l2 + l3 + 1)>>1; | |
| 1613 src[3+1*stride]= | |
| 1614 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2; | |
| 1615 src[3+2*stride]= | |
| 1616 src[1+3*stride]= | |
| 1617 src[0+3*stride]= | |
| 1618 src[2+2*stride]= | |
| 1619 src[2+3*stride]= | |
| 1620 src[3+3*stride]=l3; | |
| 1282 | 1621 } |
| 1168 | 1622 |
| 1623 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1624 const int lt= src[-1-1*stride]; | |
| 1625 LOAD_TOP_EDGE | |
| 1626 LOAD_LEFT_EDGE | |
| 1627 const __attribute__((unused)) int unu= t3; | |
| 1628 | |
| 1629 src[0+0*stride]= | |
| 1630 src[2+1*stride]=(lt + l0 + 1)>>1; | |
| 1631 src[1+0*stride]= | |
| 1632 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1633 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1634 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1635 src[0+1*stride]= | |
| 1636 src[2+2*stride]=(l0 + l1 + 1)>>1; | |
| 1637 src[1+1*stride]= | |
| 1638 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
| 1639 src[0+2*stride]= | |
| 1640 src[2+3*stride]=(l1 + l2+ 1)>>1; | |
| 1641 src[1+2*stride]= | |
| 1642 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1643 src[0+3*stride]=(l2 + l3 + 1)>>1; | |
| 1644 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
| 1282 | 1645 } |
| 1168 | 1646 |
| 1647 static void pred16x16_vertical_c(uint8_t *src, int stride){ | |
| 1648 int i; | |
| 1649 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 1650 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
| 1651 const uint32_t c= ((uint32_t*)(src-stride))[2]; | |
| 1652 const uint32_t d= ((uint32_t*)(src-stride))[3]; | |
| 1653 | |
| 1654 for(i=0; i<16; i++){ | |
| 1655 ((uint32_t*)(src+i*stride))[0]= a; | |
| 1656 ((uint32_t*)(src+i*stride))[1]= b; | |
| 1657 ((uint32_t*)(src+i*stride))[2]= c; | |
| 1658 ((uint32_t*)(src+i*stride))[3]= d; | |
| 1659 } | |
| 1660 } | |
| 1661 | |
| 1662 static void pred16x16_horizontal_c(uint8_t *src, int stride){ | |
| 1663 int i; | |
| 1664 | |
| 1665 for(i=0; i<16; i++){ | |
| 1666 ((uint32_t*)(src+i*stride))[0]= | |
| 1667 ((uint32_t*)(src+i*stride))[1]= | |
| 1668 ((uint32_t*)(src+i*stride))[2]= | |
| 1669 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101; | |
| 1670 } | |
| 1671 } | |
| 1672 | |
| 1673 static void pred16x16_dc_c(uint8_t *src, int stride){ | |
| 1674 int i, dc=0; | |
| 1675 | |
| 1676 for(i=0;i<16; i++){ | |
| 1677 dc+= src[-1+i*stride]; | |
| 1678 } | |
| 1679 | |
| 1680 for(i=0;i<16; i++){ | |
| 1681 dc+= src[i-stride]; | |
| 1682 } | |
| 1683 | |
| 1684 dc= 0x01010101*((dc + 16)>>5); | |
| 1685 | |
| 1686 for(i=0; i<16; i++){ | |
| 1687 ((uint32_t*)(src+i*stride))[0]= | |
| 1688 ((uint32_t*)(src+i*stride))[1]= | |
| 1689 ((uint32_t*)(src+i*stride))[2]= | |
| 1690 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 1691 } | |
| 1692 } | |
| 1693 | |
| 1694 static void pred16x16_left_dc_c(uint8_t *src, int stride){ | |
| 1695 int i, dc=0; | |
| 1696 | |
| 1697 for(i=0;i<16; i++){ | |
| 1698 dc+= src[-1+i*stride]; | |
| 1699 } | |
| 1700 | |
| 1701 dc= 0x01010101*((dc + 8)>>4); | |
| 1702 | |
| 1703 for(i=0; i<16; i++){ | |
| 1704 ((uint32_t*)(src+i*stride))[0]= | |
| 1705 ((uint32_t*)(src+i*stride))[1]= | |
| 1706 ((uint32_t*)(src+i*stride))[2]= | |
| 1707 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 1708 } | |
| 1709 } | |
| 1710 | |
| 1711 static void pred16x16_top_dc_c(uint8_t *src, int stride){ | |
| 1712 int i, dc=0; | |
| 1713 | |
| 1714 for(i=0;i<16; i++){ | |
| 1715 dc+= src[i-stride]; | |
| 1716 } | |
| 1717 dc= 0x01010101*((dc + 8)>>4); | |
| 1718 | |
| 1719 for(i=0; i<16; i++){ | |
| 1720 ((uint32_t*)(src+i*stride))[0]= | |
| 1721 ((uint32_t*)(src+i*stride))[1]= | |
| 1722 ((uint32_t*)(src+i*stride))[2]= | |
| 1723 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 1724 } | |
| 1725 } | |
| 1726 | |
| 1727 static void pred16x16_128_dc_c(uint8_t *src, int stride){ | |
| 1728 int i; | |
| 1729 | |
| 1730 for(i=0; i<16; i++){ | |
| 1731 ((uint32_t*)(src+i*stride))[0]= | |
| 1732 ((uint32_t*)(src+i*stride))[1]= | |
| 1733 ((uint32_t*)(src+i*stride))[2]= | |
| 1734 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U; | |
| 1735 } | |
| 1736 } | |
| 1737 | |
| 1234 | 1738 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
|
1739 int i, j, k; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1740 int a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1741 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
|
1742 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
|
1743 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
|
1744 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
|
1745 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
|
1746 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
|
1747 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
|
1748 src1 += stride; src2 -= stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1749 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
|
1750 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
|
1751 } |
| 1234 | 1752 if(svq3){ |
| 1753 H = ( 5*(H/4) ) / 16; | |
| 1754 V = ( 5*(V/4) ) / 16; | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1755 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1756 /* required for 100% accuracy */ |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
1757 i = H; H = V; V = i; |
| 1234 | 1758 }else{ |
| 1759 H = ( 5*H+32 ) >> 6; | |
| 1760 V = ( 5*V+32 ) >> 6; | |
| 1761 } | |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1762 |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1763 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
|
1764 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
|
1765 int b = a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1766 a += V; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1767 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
|
1768 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
|
1769 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
|
1770 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
|
1771 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
|
1772 b += 4*H; |
| 1168 | 1773 } |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1774 src += stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1775 } |
| 1168 | 1776 } |
| 1777 | |
| 1234 | 1778 static void pred16x16_plane_c(uint8_t *src, int stride){ |
| 1779 pred16x16_plane_compat_c(src, stride, 0); | |
| 1780 } | |
| 1781 | |
| 1168 | 1782 static void pred8x8_vertical_c(uint8_t *src, int stride){ |
| 1783 int i; | |
| 1784 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 1785 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
| 1786 | |
| 1787 for(i=0; i<8; i++){ | |
| 1788 ((uint32_t*)(src+i*stride))[0]= a; | |
| 1789 ((uint32_t*)(src+i*stride))[1]= b; | |
| 1790 } | |
| 1791 } | |
| 1792 | |
| 1793 static void pred8x8_horizontal_c(uint8_t *src, int stride){ | |
| 1794 int i; | |
| 1795 | |
| 1796 for(i=0; i<8; i++){ | |
| 1797 ((uint32_t*)(src+i*stride))[0]= | |
| 1798 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101; | |
| 1799 } | |
| 1800 } | |
| 1801 | |
| 1802 static void pred8x8_128_dc_c(uint8_t *src, int stride){ | |
| 1803 int i; | |
| 1804 | |
| 1805 for(i=0; i<4; i++){ | |
| 1806 ((uint32_t*)(src+i*stride))[0]= | |
| 1807 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; | |
| 1808 } | |
| 1809 for(i=4; i<8; i++){ | |
| 1810 ((uint32_t*)(src+i*stride))[0]= | |
| 1811 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; | |
| 1812 } | |
| 1813 } | |
| 1814 | |
| 1815 static void pred8x8_left_dc_c(uint8_t *src, int stride){ | |
| 1816 int i; | |
| 1817 int dc0, dc2; | |
| 1818 | |
| 1819 dc0=dc2=0; | |
| 1820 for(i=0;i<4; i++){ | |
| 1821 dc0+= src[-1+i*stride]; | |
| 1822 dc2+= src[-1+(i+4)*stride]; | |
| 1823 } | |
| 1824 dc0= 0x01010101*((dc0 + 2)>>2); | |
| 1825 dc2= 0x01010101*((dc2 + 2)>>2); | |
| 1826 | |
| 1827 for(i=0; i<4; i++){ | |
| 1828 ((uint32_t*)(src+i*stride))[0]= | |
| 1829 ((uint32_t*)(src+i*stride))[1]= dc0; | |
| 1830 } | |
| 1831 for(i=4; i<8; i++){ | |
| 1832 ((uint32_t*)(src+i*stride))[0]= | |
| 1833 ((uint32_t*)(src+i*stride))[1]= dc2; | |
| 1834 } | |
| 1835 } | |
| 1836 | |
| 1837 static void pred8x8_top_dc_c(uint8_t *src, int stride){ | |
| 1838 int i; | |
| 1839 int dc0, dc1; | |
| 1840 | |
| 1841 dc0=dc1=0; | |
| 1842 for(i=0;i<4; i++){ | |
| 1843 dc0+= src[i-stride]; | |
| 1844 dc1+= src[4+i-stride]; | |
| 1845 } | |
| 1846 dc0= 0x01010101*((dc0 + 2)>>2); | |
| 1847 dc1= 0x01010101*((dc1 + 2)>>2); | |
| 1848 | |
| 1849 for(i=0; i<4; i++){ | |
| 1850 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 1851 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 1852 } | |
| 1853 for(i=4; i<8; i++){ | |
| 1854 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 1855 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 1856 } | |
| 1857 } | |
| 1858 | |
| 1859 | |
| 1860 static void pred8x8_dc_c(uint8_t *src, int stride){ | |
| 1861 int i; | |
| 1862 int dc0, dc1, dc2, dc3; | |
| 1863 | |
| 1864 dc0=dc1=dc2=0; | |
| 1865 for(i=0;i<4; i++){ | |
| 1866 dc0+= src[-1+i*stride] + src[i-stride]; | |
| 1867 dc1+= src[4+i-stride]; | |
| 1868 dc2+= src[-1+(i+4)*stride]; | |
| 1869 } | |
| 1870 dc3= 0x01010101*((dc1 + dc2 + 4)>>3); | |
| 1871 dc0= 0x01010101*((dc0 + 4)>>3); | |
| 1872 dc1= 0x01010101*((dc1 + 2)>>2); | |
| 1873 dc2= 0x01010101*((dc2 + 2)>>2); | |
| 1874 | |
| 1875 for(i=0; i<4; i++){ | |
| 1876 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 1877 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 1878 } | |
| 1879 for(i=4; i<8; i++){ | |
| 1880 ((uint32_t*)(src+i*stride))[0]= dc2; | |
| 1881 ((uint32_t*)(src+i*stride))[1]= dc3; | |
| 1882 } | |
| 1883 } | |
| 1884 | |
| 1885 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
|
1886 int j, k; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1887 int a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1888 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
|
1889 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
|
1890 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
|
1891 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
|
1892 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
|
1893 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
|
1894 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
|
1895 src1 += stride; src2 -= stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1896 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
|
1897 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
|
1898 } |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1899 H = ( 17*H+16 ) >> 5; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1900 V = ( 17*V+16 ) >> 5; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1901 |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1902 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
|
1903 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
|
1904 int b = a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1905 a += V; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1906 src[0] = cm[ (b ) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1907 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
|
1908 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
|
1909 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
|
1910 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
|
1911 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
|
1912 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
|
1913 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
|
1914 src += stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
1915 } |
| 1168 | 1916 } |
| 1917 | |
| 1918 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list, | |
| 1919 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 1920 int src_x_offset, int src_y_offset, | |
| 1921 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){ | |
| 1922 MpegEncContext * const s = &h->s; | |
| 1923 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8; | |
| 1924 const int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8; | |
| 1925 const int luma_xy= (mx&3) + ((my&3)<<2); | |
| 1926 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*s->linesize; | |
| 1927 uint8_t * src_cb= pic->data[1] + (mx>>3) + (my>>3)*s->uvlinesize; | |
| 1928 uint8_t * src_cr= pic->data[2] + (mx>>3) + (my>>3)*s->uvlinesize; | |
| 1929 int extra_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; //FIXME increase edge?, IMHO not worth it | |
| 1930 int extra_height= extra_width; | |
| 1931 int emu=0; | |
| 1932 const int full_mx= mx>>2; | |
| 1933 const int full_my= my>>2; | |
| 1934 | |
| 1935 assert(pic->data[0]); | |
| 1936 | |
| 1937 if(mx&7) extra_width -= 3; | |
| 1938 if(my&7) extra_height -= 3; | |
| 1939 | |
| 1940 if( full_mx < 0-extra_width | |
| 1941 || full_my < 0-extra_height | |
| 1942 || full_mx + 16/*FIXME*/ > s->width + extra_width | |
| 1943 || full_my + 16/*FIXME*/ > s->height + extra_height){ | |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
1944 ff_emulated_edge_mc(s->edge_emu_buffer, src_y - 2 - 2*s->linesize, s->linesize, 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, s->width, s->height); |
| 1168 | 1945 src_y= s->edge_emu_buffer + 2 + 2*s->linesize; |
| 1946 emu=1; | |
| 1947 } | |
| 1948 | |
| 1949 qpix_op[luma_xy](dest_y, src_y, s->linesize); //FIXME try variable height perhaps? | |
| 1950 if(!square){ | |
| 1951 qpix_op[luma_xy](dest_y + delta, src_y + delta, s->linesize); | |
| 1952 } | |
| 1953 | |
| 1954 if(s->flags&CODEC_FLAG_GRAY) return; | |
| 1955 | |
| 1956 if(emu){ | |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
1957 ff_emulated_edge_mc(s->edge_emu_buffer, src_cb, s->uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), s->width>>1, s->height>>1); |
| 1168 | 1958 src_cb= s->edge_emu_buffer; |
| 1959 } | |
| 1960 chroma_op(dest_cb, src_cb, s->uvlinesize, chroma_height, mx&7, my&7); | |
| 1961 | |
| 1962 if(emu){ | |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
1963 ff_emulated_edge_mc(s->edge_emu_buffer, src_cr, s->uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), s->width>>1, s->height>>1); |
| 1168 | 1964 src_cr= s->edge_emu_buffer; |
| 1965 } | |
| 1966 chroma_op(dest_cr, src_cr, s->uvlinesize, chroma_height, mx&7, my&7); | |
| 1967 } | |
| 1968 | |
| 1969 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta, | |
| 1970 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 1971 int x_offset, int y_offset, | |
| 1972 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 1973 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
| 1974 int list0, int list1){ | |
| 1975 MpegEncContext * const s = &h->s; | |
| 1976 qpel_mc_func *qpix_op= qpix_put; | |
| 1977 h264_chroma_mc_func chroma_op= chroma_put; | |
| 1978 | |
| 1979 dest_y += 2*x_offset + 2*y_offset*s-> linesize; | |
| 1980 dest_cb += x_offset + y_offset*s->uvlinesize; | |
| 1981 dest_cr += x_offset + y_offset*s->uvlinesize; | |
| 1982 x_offset += 8*s->mb_x; | |
| 1983 y_offset += 8*s->mb_y; | |
| 1984 | |
| 1985 if(list0){ | |
| 1169 | 1986 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ]; |
| 1168 | 1987 mc_dir_part(h, ref, n, square, chroma_height, delta, 0, |
| 1988 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 1989 qpix_op, chroma_op); | |
| 1990 | |
| 1991 qpix_op= qpix_avg; | |
| 1992 chroma_op= chroma_avg; | |
| 1993 } | |
| 1994 | |
| 1995 if(list1){ | |
| 1169 | 1996 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ]; |
| 1168 | 1997 mc_dir_part(h, ref, n, square, chroma_height, delta, 1, |
| 1998 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 1999 qpix_op, chroma_op); | |
| 2000 } | |
| 2001 } | |
| 2002 | |
| 2003 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2004 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put), | |
| 2005 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg)){ | |
| 2006 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
|
2007 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 2008 const int mb_type= s->current_picture.mb_type[mb_xy]; |
| 2009 | |
| 2010 assert(IS_INTER(mb_type)); | |
| 2011 | |
| 2012 if(IS_16X16(mb_type)){ | |
| 2013 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2014 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0], | |
| 2015 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); | |
| 2016 }else if(IS_16X8(mb_type)){ | |
| 2017 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2018 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
| 2019 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); | |
| 2020 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4, | |
| 2021 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
| 2022 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); | |
| 2023 }else if(IS_8X16(mb_type)){ | |
| 2024 mc_part(h, 0, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2025 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
| 2026 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); | |
| 2027 mc_part(h, 4, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 4, 0, | |
| 2028 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
| 2029 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); | |
| 2030 }else{ | |
| 2031 int i; | |
| 2032 | |
| 2033 assert(IS_8X8(mb_type)); | |
| 2034 | |
| 2035 for(i=0; i<4; i++){ | |
| 2036 const int sub_mb_type= h->sub_mb_type[i]; | |
| 2037 const int n= 4*i; | |
| 2038 int x_offset= (i&1)<<2; | |
| 2039 int y_offset= (i&2)<<1; | |
| 2040 | |
| 2041 if(IS_SUB_8X8(sub_mb_type)){ | |
| 2042 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2043 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
| 2044 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
| 2045 }else if(IS_SUB_8X4(sub_mb_type)){ | |
| 2046 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2047 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
| 2048 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
| 2049 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2, | |
| 2050 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
| 2051 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
| 2052 }else if(IS_SUB_4X8(sub_mb_type)){ | |
| 2053 mc_part(h, n , 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2054 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
| 2055 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
| 2056 mc_part(h, n+1, 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset, | |
| 2057 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
| 2058 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
| 2059 }else{ | |
| 2060 int j; | |
| 2061 assert(IS_SUB_4X4(sub_mb_type)); | |
| 2062 for(j=0; j<4; j++){ | |
| 2063 int sub_x_offset= x_offset + 2*(j&1); | |
| 2064 int sub_y_offset= y_offset + (j&2); | |
| 2065 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset, | |
| 2066 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
| 2067 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); | |
| 2068 } | |
| 2069 } | |
| 2070 } | |
| 2071 } | |
| 2072 } | |
| 2073 | |
| 2074 static void decode_init_vlc(H264Context *h){ | |
| 2075 static int done = 0; | |
| 2076 | |
| 2077 if (!done) { | |
| 2078 int i; | |
| 2079 done = 1; | |
| 2080 | |
| 2081 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5, | |
| 2082 &chroma_dc_coeff_token_len [0], 1, 1, | |
| 2083 &chroma_dc_coeff_token_bits[0], 1, 1); | |
| 2084 | |
| 2085 for(i=0; i<4; i++){ | |
| 2086 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17, | |
| 2087 &coeff_token_len [i][0], 1, 1, | |
| 2088 &coeff_token_bits[i][0], 1, 1); | |
| 2089 } | |
| 2090 | |
| 2091 for(i=0; i<3; i++){ | |
| 2092 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4, | |
| 2093 &chroma_dc_total_zeros_len [i][0], 1, 1, | |
| 2094 &chroma_dc_total_zeros_bits[i][0], 1, 1); | |
| 2095 } | |
| 2096 for(i=0; i<15; i++){ | |
| 2097 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16, | |
| 2098 &total_zeros_len [i][0], 1, 1, | |
| 2099 &total_zeros_bits[i][0], 1, 1); | |
| 2100 } | |
| 2101 | |
| 2102 for(i=0; i<6; i++){ | |
| 2103 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7, | |
| 2104 &run_len [i][0], 1, 1, | |
| 2105 &run_bits[i][0], 1, 1); | |
| 2106 } | |
| 2107 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16, | |
| 2108 &run_len [6][0], 1, 1, | |
| 2109 &run_bits[6][0], 1, 1); | |
| 2110 } | |
| 2111 } | |
| 2112 | |
| 2113 /** | |
| 2114 * Sets the intra prediction function pointers. | |
| 2115 */ | |
| 2116 static void init_pred_ptrs(H264Context *h){ | |
| 2117 // MpegEncContext * const s = &h->s; | |
| 2118 | |
| 2119 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; | |
| 2120 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; | |
| 2121 h->pred4x4[DC_PRED ]= pred4x4_dc_c; | |
| 2122 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c; | |
| 2123 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c; | |
| 2124 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c; | |
| 2125 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c; | |
| 2126 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c; | |
| 2127 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c; | |
| 2128 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c; | |
| 2129 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c; | |
| 2130 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; | |
| 2131 | |
| 2132 h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c; | |
| 2133 h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c; | |
| 2134 h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c; | |
| 2135 h->pred8x8[PLANE_PRED8x8 ]= pred8x8_plane_c; | |
| 2136 h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c; | |
| 2137 h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c; | |
| 2138 h->pred8x8[DC_128_PRED8x8 ]= pred8x8_128_dc_c; | |
| 2139 | |
| 2140 h->pred16x16[DC_PRED8x8 ]= pred16x16_dc_c; | |
| 2141 h->pred16x16[VERT_PRED8x8 ]= pred16x16_vertical_c; | |
| 2142 h->pred16x16[HOR_PRED8x8 ]= pred16x16_horizontal_c; | |
| 2143 h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c; | |
| 2144 h->pred16x16[LEFT_DC_PRED8x8]= pred16x16_left_dc_c; | |
| 2145 h->pred16x16[TOP_DC_PRED8x8 ]= pred16x16_top_dc_c; | |
| 2146 h->pred16x16[DC_128_PRED8x8 ]= pred16x16_128_dc_c; | |
| 2147 } | |
| 2148 | |
| 2149 static void free_tables(H264Context *h){ | |
| 2150 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
|
2151 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
|
2152 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
|
2153 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
|
2154 av_freep(&h->mvd_table[1]); |
| 1168 | 2155 av_freep(&h->non_zero_count); |
| 2156 av_freep(&h->slice_table_base); | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2157 av_freep(&h->top_border); |
| 1168 | 2158 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
|
2159 |
| 1168 | 2160 av_freep(&h->mb2b_xy); |
| 2161 av_freep(&h->mb2b8_xy); | |
| 2162 } | |
| 2163 | |
| 2164 /** | |
| 2165 * allocates tables. | |
| 2166 * needs widzh/height | |
| 2167 */ | |
| 2168 static int alloc_tables(H264Context *h){ | |
| 2169 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
|
2170 const int big_mb_num= s->mb_stride * (s->mb_height+1); |
| 1168 | 2171 int x,y; |
| 2172 | |
| 2173 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
|
2174 |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2175 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t)) |
| 1168 | 2176 CHECKED_ALLOCZ(h->slice_table_base , big_mb_num * sizeof(uint8_t)) |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2177 CHECKED_ALLOCZ(h->top_border , s->mb_width * (16+8+8) * sizeof(uint8_t)) |
| 1168 | 2178 |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2179 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
|
2180 CHECKED_ALLOCZ(h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t)) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2181 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t)) |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2182 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
|
2183 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t)); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2184 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2185 |
| 1168 | 2186 memset(h->slice_table_base, -1, big_mb_num * sizeof(uint8_t)); |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2187 h->slice_table= h->slice_table_base + s->mb_stride + 1; |
| 1168 | 2188 |
| 2189 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint16_t)); | |
| 2190 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint16_t)); | |
| 2191 for(y=0; y<s->mb_height; y++){ | |
| 2192 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
|
2193 const int mb_xy= x + y*s->mb_stride; |
| 1168 | 2194 const int b_xy = 4*x + 4*y*h->b_stride; |
| 2195 const int b8_xy= 2*x + 2*y*h->b8_stride; | |
| 2196 | |
| 2197 h->mb2b_xy [mb_xy]= b_xy; | |
| 2198 h->mb2b8_xy[mb_xy]= b8_xy; | |
| 2199 } | |
| 2200 } | |
| 2201 | |
| 2202 return 0; | |
| 2203 fail: | |
| 2204 free_tables(h); | |
| 2205 return -1; | |
| 2206 } | |
| 2207 | |
| 2208 static void common_init(H264Context *h){ | |
| 2209 MpegEncContext * const s = &h->s; | |
| 2210 | |
| 2211 s->width = s->avctx->width; | |
| 2212 s->height = s->avctx->height; | |
| 2213 s->codec_id= s->avctx->codec->id; | |
| 2214 | |
| 2215 init_pred_ptrs(h); | |
| 2216 | |
| 1698 | 2217 s->unrestricted_mv=1; |
| 1168 | 2218 s->decode=1; //FIXME |
| 2219 } | |
| 2220 | |
| 2221 static int decode_init(AVCodecContext *avctx){ | |
| 2222 H264Context *h= avctx->priv_data; | |
| 2223 MpegEncContext * const s = &h->s; | |
| 2224 | |
| 1892 | 2225 MPV_decode_defaults(s); |
| 2226 | |
| 1168 | 2227 s->avctx = avctx; |
| 2228 common_init(h); | |
| 2229 | |
| 2230 s->out_format = FMT_H264; | |
| 2231 s->workaround_bugs= avctx->workaround_bugs; | |
| 2232 | |
| 2233 // set defaults | |
| 2234 // s->decode_mb= ff_h263_decode_mb; | |
| 2235 s->low_delay= 1; | |
| 2236 avctx->pix_fmt= PIX_FMT_YUV420P; | |
| 2237 | |
| 2238 decode_init_vlc(h); | |
| 2239 | |
| 2227 | 2240 if(avctx->codec_tag != 0x31637661) // avc1 |
| 2241 h->is_avc = 0; | |
| 2242 else { | |
| 2243 if((avctx->extradata_size == 0) || (avctx->extradata == NULL)) { | |
| 2244 av_log(avctx, AV_LOG_ERROR, "AVC codec requires avcC data\n"); | |
| 2245 return -1; | |
| 2246 } | |
| 2247 h->is_avc = 1; | |
| 2248 h->got_avcC = 0; | |
| 2249 } | |
| 2250 | |
| 1168 | 2251 return 0; |
| 2252 } | |
| 2253 | |
| 2254 static void frame_start(H264Context *h){ | |
| 2255 MpegEncContext * const s = &h->s; | |
| 2256 int i; | |
| 2257 | |
| 2258 MPV_frame_start(s, s->avctx); | |
| 2259 ff_er_frame_start(s); | |
| 2260 h->mmco_index=0; | |
| 2261 | |
| 2262 assert(s->linesize && s->uvlinesize); | |
| 2263 | |
| 2264 for(i=0; i<16; i++){ | |
| 2265 h->block_offset[i]= 4*((scan8[i] - scan8[0])&7) + 4*s->linesize*((scan8[i] - scan8[0])>>3); | |
| 2266 h->chroma_subblock_offset[i]= 2*((scan8[i] - scan8[0])&7) + 2*s->uvlinesize*((scan8[i] - scan8[0])>>3); | |
| 2267 } | |
| 2268 for(i=0; i<4; i++){ | |
| 2269 h->block_offset[16+i]= | |
| 2270 h->block_offset[20+i]= 4*((scan8[i] - scan8[0])&7) + 4*s->uvlinesize*((scan8[i] - scan8[0])>>3); | |
| 2271 } | |
| 2272 | |
| 2273 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; | |
| 2274 } | |
| 2275 | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2276 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
|
2277 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
|
2278 int i; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2279 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2280 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
|
2281 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
|
2282 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
|
2283 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2284 h->left_border[0]= h->top_border[s->mb_x][15]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2285 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
|
2286 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
|
2287 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2288 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2289 *(uint64_t*)(h->top_border[s->mb_x]+0)= *(uint64_t*)(src_y + 16*linesize); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2290 *(uint64_t*)(h->top_border[s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2291 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2292 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2293 h->left_border[17 ]= h->top_border[s->mb_x][16+7]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2294 h->left_border[17+9]= h->top_border[s->mb_x][24+7]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2295 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
|
2296 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
|
2297 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
|
2298 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2299 *(uint64_t*)(h->top_border[s->mb_x]+16)= *(uint64_t*)(src_cb+8*uvlinesize); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2300 *(uint64_t*)(h->top_border[s->mb_x]+24)= *(uint64_t*)(src_cr+8*uvlinesize); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2301 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2302 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2303 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2304 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
|
2305 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
|
2306 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
|
2307 uint64_t temp64; |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2308 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
|
2309 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
|
2310 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2311 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
|
2312 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
|
2313 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
|
2314 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2315 #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
|
2316 t= a;\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2317 if(xchg)\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2318 a= b;\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2319 b= t; |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2320 |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2321 if(deblock_left){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2322 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
|
2323 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
|
2324 } |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2325 } |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2326 |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2327 if(deblock_top){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2328 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2329 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2330 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2331 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2332 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
|
2333 if(deblock_left){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2334 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
|
2335 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
|
2336 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
|
2337 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2338 } |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2339 if(deblock_top){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2340 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2341 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2342 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2343 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2344 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2345 |
| 1168 | 2346 static void hl_decode_mb(H264Context *h){ |
| 2347 MpegEncContext * const s = &h->s; | |
| 2348 const int mb_x= s->mb_x; | |
| 2349 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
|
2350 const int mb_xy= mb_x + mb_y*s->mb_stride; |
| 1168 | 2351 const int mb_type= s->current_picture.mb_type[mb_xy]; |
| 2352 uint8_t *dest_y, *dest_cb, *dest_cr; | |
| 2353 int linesize, uvlinesize /*dct_offset*/; | |
| 2354 int i; | |
| 2355 | |
| 2356 if(!s->decode) | |
| 2357 return; | |
| 2358 | |
| 2359 if(s->mb_skiped){ | |
| 2360 } | |
| 2361 | |
| 2362 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; | |
| 2363 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 2364 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 2365 | |
| 2366 if (h->mb_field_decoding_flag) { | |
| 2367 linesize = s->linesize * 2; | |
| 2368 uvlinesize = s->uvlinesize * 2; | |
| 2369 if(mb_y&1){ //FIXME move out of this func? | |
| 2370 dest_y -= s->linesize*15; | |
| 2371 dest_cb-= s->linesize*7; | |
| 2372 dest_cr-= s->linesize*7; | |
| 2373 } | |
| 2374 } else { | |
| 2375 linesize = s->linesize; | |
| 2376 uvlinesize = s->uvlinesize; | |
| 2377 // dct_offset = s->linesize * 16; | |
| 2378 } | |
| 2379 | |
| 2380 if(IS_INTRA(mb_type)){ | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2381 if(h->deblocking_filter) |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2382 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2383 |
| 1168 | 2384 if(!(s->flags&CODEC_FLAG_GRAY)){ |
| 2385 h->pred8x8[ h->chroma_pred_mode ](dest_cb, uvlinesize); | |
| 2386 h->pred8x8[ h->chroma_pred_mode ](dest_cr, uvlinesize); | |
| 2387 } | |
| 2388 | |
| 2389 if(IS_INTRA4x4(mb_type)){ | |
| 2390 if(!s->encoding){ | |
| 2391 for(i=0; i<16; i++){ | |
| 2392 uint8_t * const ptr= dest_y + h->block_offset[i]; | |
| 2393 uint8_t *topright= ptr + 4 - linesize; | |
| 2394 const int topright_avail= (h->topright_samples_available<<i)&0x8000; | |
| 2395 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ]; | |
| 2396 int tr; | |
| 2397 | |
| 2398 if(!topright_avail){ | |
| 2399 tr= ptr[3 - linesize]*0x01010101; | |
| 2400 topright= (uint8_t*) &tr; | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2401 }else if(i==5 && h->deblocking_filter){ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2402 tr= *(uint32_t*)h->top_border[mb_x+1]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2403 topright= (uint8_t*) &tr; |
| 1168 | 2404 } |
| 2405 | |
| 2406 h->pred4x4[ dir ](ptr, topright, linesize); | |
| 1234 | 2407 if(h->non_zero_count_cache[ scan8[i] ]){ |
| 2408 if(s->codec_id == CODEC_ID_H264) | |
|
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
2409 s->dsp.h264_idct_add(ptr, h->mb + i*16, linesize); |
| 1234 | 2410 else |
| 2411 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0); | |
| 2412 } | |
| 1168 | 2413 } |
| 2414 } | |
| 2415 }else{ | |
| 2416 h->pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize); | |
| 1234 | 2417 if(s->codec_id == CODEC_ID_H264) |
| 2418 h264_luma_dc_dequant_idct_c(h->mb, s->qscale); | |
| 2419 else | |
| 2420 svq3_luma_dc_dequant_idct_c(h->mb, s->qscale); | |
| 1168 | 2421 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2422 if(h->deblocking_filter) |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2423 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0); |
| 1234 | 2424 }else if(s->codec_id == CODEC_ID_H264){ |
| 1168 | 2425 hl_motion(h, dest_y, dest_cb, dest_cr, |
| 2426 s->dsp.put_h264_qpel_pixels_tab, s->dsp.put_h264_chroma_pixels_tab, | |
| 2427 s->dsp.avg_h264_qpel_pixels_tab, s->dsp.avg_h264_chroma_pixels_tab); | |
| 2428 } | |
| 2429 | |
| 2430 | |
| 2431 if(!IS_INTRA4x4(mb_type)){ | |
| 1250 | 2432 if(s->codec_id == CODEC_ID_H264){ |
| 2433 for(i=0; i<16; i++){ | |
| 2434 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below | |
| 2435 uint8_t * const ptr= dest_y + h->block_offset[i]; | |
|
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
2436 s->dsp.h264_idct_add(ptr, h->mb + i*16, linesize); |
| 1250 | 2437 } |
| 2438 } | |
| 2439 }else{ | |
| 2440 for(i=0; i<16; i++){ | |
| 2441 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below | |
| 2442 uint8_t * const ptr= dest_y + h->block_offset[i]; | |
| 1234 | 2443 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); |
| 1250 | 2444 } |
| 1168 | 2445 } |
| 2446 } | |
| 2447 } | |
| 2448 | |
| 2449 if(!(s->flags&CODEC_FLAG_GRAY)){ | |
| 2450 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp); | |
| 2451 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp); | |
| 1250 | 2452 if(s->codec_id == CODEC_ID_H264){ |
| 2453 for(i=16; i<16+4; i++){ | |
| 2454 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ | |
| 2455 uint8_t * const ptr= dest_cb + h->block_offset[i]; | |
|
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
2456 s->dsp.h264_idct_add(ptr, h->mb + i*16, uvlinesize); |
| 1250 | 2457 } |
| 2458 } | |
| 2459 for(i=20; i<20+4; i++){ | |
| 2460 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ | |
| 2461 uint8_t * const ptr= dest_cr + h->block_offset[i]; | |
|
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
2462 s->dsp.h264_idct_add(ptr, h->mb + i*16, uvlinesize); |
| 1250 | 2463 } |
| 1168 | 2464 } |
| 1250 | 2465 }else{ |
| 2466 for(i=16; i<16+4; i++){ | |
| 2467 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ | |
| 2468 uint8_t * const ptr= dest_cb + h->block_offset[i]; | |
| 1234 | 2469 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2); |
| 1250 | 2470 } |
| 2471 } | |
| 2472 for(i=20; i<20+4; i++){ | |
| 2473 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ | |
| 2474 uint8_t * const ptr= dest_cr + h->block_offset[i]; | |
| 2475 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2); | |
| 2476 } | |
| 1168 | 2477 } |
| 2478 } | |
| 2479 } | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2480 if(h->deblocking_filter) { |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2481 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2482 filter_mb(h, mb_x, mb_y, dest_y, dest_cb, dest_cr); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2483 } |
| 1168 | 2484 } |
| 2485 | |
| 2486 /** | |
| 2487 * fills the default_ref_list. | |
| 2488 */ | |
| 2489 static int fill_default_ref_list(H264Context *h){ | |
| 2490 MpegEncContext * const s = &h->s; | |
| 2491 int i; | |
| 2492 Picture sorted_short_ref[16]; | |
| 2493 | |
| 2494 if(h->slice_type==B_TYPE){ | |
| 2495 int out_i; | |
| 2496 int limit= -1; | |
| 2497 | |
| 2498 for(out_i=0; out_i<h->short_ref_count; out_i++){ | |
| 2499 int best_i=-1; | |
|
2255
507690ff49a2
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2254
diff
changeset
|
2500 int best_poc=INT_MAX; |
| 1168 | 2501 |
| 2502 for(i=0; i<h->short_ref_count; i++){ | |
| 2503 const int poc= h->short_ref[i]->poc; | |
| 2504 if(poc > limit && poc < best_poc){ | |
| 2505 best_poc= poc; | |
| 2506 best_i= i; | |
| 2507 } | |
| 2508 } | |
| 2509 | |
| 2510 assert(best_i != -1); | |
| 2511 | |
| 2512 limit= best_poc; | |
| 2513 sorted_short_ref[out_i]= *h->short_ref[best_i]; | |
| 2514 } | |
| 2515 } | |
| 2516 | |
| 2517 if(s->picture_structure == PICT_FRAME){ | |
| 2518 if(h->slice_type==B_TYPE){ | |
| 2519 const int current_poc= s->current_picture_ptr->poc; | |
| 2520 int list; | |
| 2521 | |
| 2522 for(list=0; list<2; list++){ | |
| 2523 int index=0; | |
| 2524 | |
| 2525 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++){ | |
| 2526 const int i2= list ? h->short_ref_count - i - 1 : i; | |
| 2527 const int poc= sorted_short_ref[i2].poc; | |
| 2528 | |
| 2529 if(sorted_short_ref[i2].reference != 3) continue; //FIXME refernce field shit | |
| 2530 | |
| 2531 if((list==1 && poc > current_poc) || (list==0 && poc < current_poc)){ | |
| 2532 h->default_ref_list[list][index ]= sorted_short_ref[i2]; | |
| 2533 h->default_ref_list[list][index++].pic_id= sorted_short_ref[i2].frame_num; | |
| 2534 } | |
| 2535 } | |
| 2536 | |
| 2537 for(i=0; i<h->long_ref_count && index < h->ref_count[ list ]; i++){ | |
| 2538 if(h->long_ref[i]->reference != 3) continue; | |
| 2539 | |
| 2540 h->default_ref_list[ list ][index ]= *h->long_ref[i]; | |
| 2541 h->default_ref_list[ list ][index++].pic_id= i;; | |
| 2542 } | |
| 2543 | |
| 2544 if(h->long_ref_count > 1 && h->short_ref_count==0){ | |
| 2545 Picture temp= h->default_ref_list[1][0]; | |
| 2546 h->default_ref_list[1][0] = h->default_ref_list[1][1]; | |
| 2547 h->default_ref_list[1][0] = temp; | |
| 2548 } | |
| 2549 | |
| 2550 if(index < h->ref_count[ list ]) | |
| 2551 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index)); | |
| 2552 } | |
| 2553 }else{ | |
| 2554 int index=0; | |
| 2555 for(i=0; i<h->short_ref_count && index < h->ref_count[0]; i++){ | |
| 2556 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit | |
| 2557 h->default_ref_list[0][index ]= *h->short_ref[i]; | |
| 2558 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num; | |
| 2559 } | |
| 2560 for(i=0; i<h->long_ref_count && index < h->ref_count[0]; i++){ | |
| 2561 if(h->long_ref[i]->reference != 3) continue; | |
| 2562 h->default_ref_list[0][index ]= *h->long_ref[i]; | |
| 2563 h->default_ref_list[0][index++].pic_id= i;; | |
| 2564 } | |
| 2565 if(index < h->ref_count[0]) | |
| 2566 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index)); | |
| 2567 } | |
| 2568 }else{ //FIELD | |
| 2569 if(h->slice_type==B_TYPE){ | |
| 2570 }else{ | |
| 2571 //FIXME second field balh | |
| 2572 } | |
| 2573 } | |
| 2574 return 0; | |
| 2575 } | |
| 2576 | |
| 2577 static int decode_ref_pic_list_reordering(H264Context *h){ | |
| 2578 MpegEncContext * const s = &h->s; | |
| 2579 int list; | |
| 2580 | |
| 2581 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move beofre func | |
| 2582 | |
| 2583 for(list=0; list<2; list++){ | |
| 2584 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]); | |
| 2585 | |
| 2586 if(get_bits1(&s->gb)){ | |
| 2587 int pred= h->curr_pic_num; | |
| 2588 int index; | |
| 2589 | |
| 2590 for(index=0; ; index++){ | |
| 2591 int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb); | |
| 2592 int pic_id; | |
| 2593 int i; | |
| 2594 | |
|
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
2595 if(reordering_of_pic_nums_idc==3) |
|
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
2596 break; |
| 1168 | 2597 |
| 2598 if(index >= h->ref_count[list]){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2599 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n"); |
| 1168 | 2600 return -1; |
| 2601 } | |
| 2602 | |
| 2603 if(reordering_of_pic_nums_idc<3){ | |
| 2604 if(reordering_of_pic_nums_idc<2){ | |
| 2605 const int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1; | |
| 2606 | |
| 2607 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
|
2608 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n"); |
| 1168 | 2609 return -1; |
| 2610 } | |
| 2611 | |
| 2612 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num; | |
| 2613 else pred+= abs_diff_pic_num; | |
| 2614 pred &= h->max_pic_num - 1; | |
| 2615 | |
| 2616 for(i= h->ref_count[list]-1; i>=index; i--){ | |
| 2617 if(h->ref_list[list][i].pic_id == pred && h->ref_list[list][i].long_ref==0) | |
| 2618 break; | |
| 2619 } | |
| 2620 }else{ | |
| 2621 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx | |
| 2622 | |
| 2623 for(i= h->ref_count[list]-1; i>=index; i--){ | |
| 2624 if(h->ref_list[list][i].pic_id == pic_id && h->ref_list[list][i].long_ref==1) | |
| 2625 break; | |
| 2626 } | |
| 2627 } | |
| 2628 | |
| 2629 if(i < index){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2630 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n"); |
| 1168 | 2631 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME |
| 2632 }else if(i > index){ | |
| 2633 Picture tmp= h->ref_list[list][i]; | |
| 2634 for(; i>index; i--){ | |
| 2635 h->ref_list[list][i]= h->ref_list[list][i-1]; | |
| 2636 } | |
| 2637 h->ref_list[list][index]= tmp; | |
| 2638 } | |
|
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
2639 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2640 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n"); |
| 1168 | 2641 return -1; |
| 2642 } | |
| 2643 } | |
| 2644 } | |
| 2645 | |
| 2646 if(h->slice_type!=B_TYPE) break; | |
| 2647 } | |
| 2648 return 0; | |
| 2649 } | |
| 2650 | |
| 2651 static int pred_weight_table(H264Context *h){ | |
| 2652 MpegEncContext * const s = &h->s; | |
| 2653 int list, i; | |
| 2654 | |
| 2655 h->luma_log2_weight_denom= get_ue_golomb(&s->gb); | |
| 2656 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb); | |
| 2657 | |
| 2658 for(list=0; list<2; list++){ | |
| 2659 for(i=0; i<h->ref_count[list]; i++){ | |
| 2660 int luma_weight_flag, chroma_weight_flag; | |
| 2661 | |
| 2662 luma_weight_flag= get_bits1(&s->gb); | |
| 2663 if(luma_weight_flag){ | |
| 2664 h->luma_weight[list][i]= get_se_golomb(&s->gb); | |
| 2665 h->luma_offset[list][i]= get_se_golomb(&s->gb); | |
| 2666 } | |
| 2667 | |
| 2668 chroma_weight_flag= get_bits1(&s->gb); | |
| 2669 if(chroma_weight_flag){ | |
| 2670 int j; | |
| 2671 for(j=0; j<2; j++){ | |
| 2672 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb); | |
| 2673 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb); | |
| 2674 } | |
| 2675 } | |
| 2676 } | |
| 2677 if(h->slice_type != B_TYPE) break; | |
| 2678 } | |
| 2679 return 0; | |
| 2680 } | |
| 2681 | |
| 2682 /** | |
| 2683 * instantaneos decoder refresh. | |
| 2684 */ | |
| 2685 static void idr(H264Context *h){ | |
| 2686 int i; | |
| 2687 | |
| 2688 for(i=0; i<h->long_ref_count; i++){ | |
| 2689 h->long_ref[i]->reference=0; | |
| 2690 h->long_ref[i]= NULL; | |
| 2691 } | |
| 2692 h->long_ref_count=0; | |
| 2693 | |
| 2694 for(i=0; i<h->short_ref_count; i++){ | |
| 2695 h->short_ref[i]->reference=0; | |
| 2696 h->short_ref[i]= NULL; | |
| 2697 } | |
| 2698 h->short_ref_count=0; | |
| 2699 } | |
| 2700 | |
| 2701 /** | |
| 2702 * | |
| 2703 * @return the removed picture or NULL if an error occures | |
| 2704 */ | |
| 2705 static Picture * remove_short(H264Context *h, int frame_num){ | |
| 1169 | 2706 MpegEncContext * const s = &h->s; |
| 1168 | 2707 int i; |
| 2708 | |
| 1169 | 2709 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
|
2710 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count); |
| 1169 | 2711 |
| 1168 | 2712 for(i=0; i<h->short_ref_count; i++){ |
| 2713 Picture *pic= h->short_ref[i]; | |
| 1169 | 2714 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
|
2715 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic); |
| 1168 | 2716 if(pic->frame_num == frame_num){ |
| 2717 h->short_ref[i]= NULL; | |
| 2718 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*)); | |
| 2719 h->short_ref_count--; | |
| 2720 return pic; | |
| 2721 } | |
| 2722 } | |
| 2723 return NULL; | |
| 2724 } | |
| 2725 | |
| 2726 /** | |
| 2727 * | |
| 2728 * @return the removed picture or NULL if an error occures | |
| 2729 */ | |
| 2730 static Picture * remove_long(H264Context *h, int i){ | |
| 2731 Picture *pic; | |
| 2732 | |
| 2733 if(i >= h->long_ref_count) return NULL; | |
| 2734 pic= h->long_ref[i]; | |
| 2735 if(pic==NULL) return NULL; | |
| 2736 | |
| 2737 h->long_ref[i]= NULL; | |
| 2738 memmove(&h->long_ref[i], &h->long_ref[i+1], (h->long_ref_count - i - 1)*sizeof(Picture*)); | |
| 2739 h->long_ref_count--; | |
| 2740 | |
| 2741 return pic; | |
| 2742 } | |
| 2743 | |
| 2744 /** | |
| 2745 * Executes the reference picture marking (memory management control operations). | |
| 2746 */ | |
| 2747 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ | |
| 2748 MpegEncContext * const s = &h->s; | |
| 2749 int i; | |
| 2750 int current_is_long=0; | |
| 2751 Picture *pic; | |
| 2752 | |
| 2753 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
|
2754 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n"); |
| 1168 | 2755 |
| 2756 for(i=0; i<mmco_count; i++){ | |
| 2757 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
|
2758 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 | 2759 |
| 2760 switch(mmco[i].opcode){ | |
| 2761 case MMCO_SHORT2UNUSED: | |
| 2762 pic= remove_short(h, mmco[i].short_frame_num); | |
| 2763 if(pic==NULL) return -1; | |
| 2764 pic->reference= 0; | |
| 2765 break; | |
| 2766 case MMCO_SHORT2LONG: | |
| 2767 pic= remove_long(h, mmco[i].long_index); | |
| 2768 if(pic) pic->reference=0; | |
| 2769 | |
| 2770 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num); | |
| 2771 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
| 2772 break; | |
| 2773 case MMCO_LONG2UNUSED: | |
| 2774 pic= remove_long(h, mmco[i].long_index); | |
| 2775 if(pic==NULL) return -1; | |
| 2776 pic->reference= 0; | |
| 2777 break; | |
| 2778 case MMCO_LONG: | |
| 2779 pic= remove_long(h, mmco[i].long_index); | |
| 2780 if(pic) pic->reference=0; | |
| 2781 | |
| 2782 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr; | |
| 2783 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
| 2784 h->long_ref_count++; | |
| 2785 | |
| 2786 current_is_long=1; | |
| 2787 break; | |
| 2788 case MMCO_SET_MAX_LONG: | |
| 2789 assert(mmco[i].long_index <= 16); | |
| 2790 while(mmco[i].long_index < h->long_ref_count){ | |
| 2791 pic= remove_long(h, mmco[i].long_index); | |
| 2792 pic->reference=0; | |
| 2793 } | |
| 2794 while(mmco[i].long_index > h->long_ref_count){ | |
| 2795 h->long_ref[ h->long_ref_count++ ]= NULL; | |
| 2796 } | |
| 2797 break; | |
| 2798 case MMCO_RESET: | |
| 2799 while(h->short_ref_count){ | |
| 2800 pic= remove_short(h, h->short_ref[0]->frame_num); | |
| 2801 pic->reference=0; | |
| 2802 } | |
| 2803 while(h->long_ref_count){ | |
| 2804 pic= remove_long(h, h->long_ref_count-1); | |
| 2805 pic->reference=0; | |
| 2806 } | |
| 2807 break; | |
| 2808 default: assert(0); | |
| 2809 } | |
| 2810 } | |
| 2811 | |
| 2812 if(!current_is_long){ | |
| 2813 pic= remove_short(h, s->current_picture_ptr->frame_num); | |
| 2814 if(pic){ | |
| 2815 pic->reference=0; | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2816 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n"); |
| 1168 | 2817 } |
| 2818 | |
| 2819 if(h->short_ref_count) | |
| 1169 | 2820 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*)); |
| 2821 | |
| 2822 h->short_ref[0]= s->current_picture_ptr; | |
| 1168 | 2823 h->short_ref[0]->long_ref=0; |
| 2824 h->short_ref_count++; | |
| 2825 } | |
| 2826 | |
| 2827 return 0; | |
| 2828 } | |
| 2829 | |
| 2830 static int decode_ref_pic_marking(H264Context *h){ | |
| 2831 MpegEncContext * const s = &h->s; | |
| 2832 int i; | |
| 2833 | |
| 2834 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields | |
| 2835 s->broken_link= get_bits1(&s->gb) -1; | |
| 2836 h->mmco[0].long_index= get_bits1(&s->gb) - 1; // current_long_term_idx | |
| 2837 if(h->mmco[0].long_index == -1) | |
| 2838 h->mmco_index= 0; | |
| 2839 else{ | |
| 2840 h->mmco[0].opcode= MMCO_LONG; | |
| 2841 h->mmco_index= 1; | |
| 2842 } | |
| 2843 }else{ | |
| 2844 if(get_bits1(&s->gb)){ // adaptive_ref_pic_marking_mode_flag | |
| 2845 for(i= h->mmco_index; i<MAX_MMCO_COUNT; i++) { | |
| 2846 MMCOOpcode opcode= get_ue_golomb(&s->gb);; | |
| 2847 | |
| 2848 h->mmco[i].opcode= opcode; | |
| 2849 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){ | |
| 2850 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 | |
| 2851 /* if(h->mmco[i].short_frame_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_frame_num ] == NULL){ | |
| 2852 fprintf(stderr, "illegal short ref in memory management control operation %d\n", mmco); | |
| 2853 return -1; | |
| 2854 }*/ | |
| 2855 } | |
| 2856 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){ | |
| 2857 h->mmco[i].long_index= get_ue_golomb(&s->gb); | |
| 2858 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
|
2859 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); |
| 1168 | 2860 return -1; |
| 2861 } | |
| 2862 } | |
| 2863 | |
| 2864 if(opcode > MMCO_LONG){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2865 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); |
| 1168 | 2866 return -1; |
| 2867 } | |
|
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
|
2868 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
|
2869 break; |
| 1168 | 2870 } |
| 2871 h->mmco_index= i; | |
| 2872 }else{ | |
| 2873 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count); | |
| 2874 | |
| 2875 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields | |
| 2876 h->mmco[0].opcode= MMCO_SHORT2UNUSED; | |
| 2877 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num; | |
| 2878 h->mmco_index= 1; | |
| 2879 }else | |
| 2880 h->mmco_index= 0; | |
| 2881 } | |
| 2882 } | |
| 2883 | |
| 2884 return 0; | |
| 2885 } | |
| 2886 | |
| 2887 static int init_poc(H264Context *h){ | |
| 2888 MpegEncContext * const s = &h->s; | |
| 2889 const int max_frame_num= 1<<h->sps.log2_max_frame_num; | |
| 2890 int field_poc[2]; | |
| 2891 | |
| 2892 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 2893 h->frame_num_offset= 0; | |
| 2894 }else{ | |
| 2895 if(h->frame_num < h->prev_frame_num) | |
| 2896 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num; | |
| 2897 else | |
| 2898 h->frame_num_offset= h->prev_frame_num_offset; | |
| 2899 } | |
| 2900 | |
| 2901 if(h->sps.poc_type==0){ | |
| 2902 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb; | |
| 2903 | |
| 2904 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2) | |
| 2905 h->poc_msb = h->prev_poc_msb + max_poc_lsb; | |
| 2906 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2) | |
| 2907 h->poc_msb = h->prev_poc_msb - max_poc_lsb; | |
| 2908 else | |
| 2909 h->poc_msb = h->prev_poc_msb; | |
| 2910 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb); | |
| 2911 field_poc[0] = | |
| 2912 field_poc[1] = h->poc_msb + h->poc_lsb; | |
| 2913 if(s->picture_structure == PICT_FRAME) | |
| 2914 field_poc[1] += h->delta_poc_bottom; | |
| 2915 }else if(h->sps.poc_type==1){ | |
| 2916 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc; | |
| 2917 int i; | |
| 2918 | |
| 2919 if(h->sps.poc_cycle_length != 0) | |
| 2920 abs_frame_num = h->frame_num_offset + h->frame_num; | |
| 2921 else | |
| 2922 abs_frame_num = 0; | |
| 2923 | |
| 2924 if(h->nal_ref_idc==0 && abs_frame_num > 0) | |
| 2925 abs_frame_num--; | |
| 2926 | |
| 2927 expected_delta_per_poc_cycle = 0; | |
| 2928 for(i=0; i < h->sps.poc_cycle_length; i++) | |
| 2929 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse | |
| 2930 | |
| 2931 if(abs_frame_num > 0){ | |
| 2932 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length; | |
| 2933 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length; | |
| 2934 | |
| 2935 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle; | |
| 2936 for(i = 0; i <= frame_num_in_poc_cycle; i++) | |
| 2937 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ]; | |
| 2938 } else | |
| 2939 expectedpoc = 0; | |
| 2940 | |
| 2941 if(h->nal_ref_idc == 0) | |
| 2942 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic; | |
| 2943 | |
| 2944 field_poc[0] = expectedpoc + h->delta_poc[0]; | |
| 2945 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field; | |
| 2946 | |
| 2947 if(s->picture_structure == PICT_FRAME) | |
| 2948 field_poc[1] += h->delta_poc[1]; | |
| 2949 }else{ | |
| 2950 int poc; | |
| 2951 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 2952 poc= 0; | |
| 2953 }else{ | |
| 2954 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num); | |
| 2955 else poc= 2*(h->frame_num_offset + h->frame_num) - 1; | |
| 2956 } | |
| 2957 field_poc[0]= poc; | |
| 2958 field_poc[1]= poc; | |
| 2959 } | |
| 2960 | |
| 2961 if(s->picture_structure != PICT_BOTTOM_FIELD) | |
| 2962 s->current_picture_ptr->field_poc[0]= field_poc[0]; | |
| 2963 if(s->picture_structure != PICT_TOP_FIELD) | |
| 2964 s->current_picture_ptr->field_poc[1]= field_poc[1]; | |
| 2965 if(s->picture_structure == PICT_FRAME) // FIXME field pix? | |
| 2966 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]); | |
| 2967 | |
| 2968 return 0; | |
| 2969 } | |
| 2970 | |
| 2971 /** | |
| 2972 * decodes a slice header. | |
| 2973 * this will allso call MPV_common_init() and frame_start() as needed | |
| 2974 */ | |
| 2975 static int decode_slice_header(H264Context *h){ | |
| 2976 MpegEncContext * const s = &h->s; | |
| 2977 int first_mb_in_slice, pps_id; | |
| 2978 int num_ref_idx_active_override_flag; | |
| 2979 static const uint8_t slice_type_map[5]= {P_TYPE, B_TYPE, I_TYPE, SP_TYPE, SI_TYPE}; | |
| 2980 | |
| 2981 s->current_picture.reference= h->nal_ref_idc != 0; | |
| 2982 | |
| 2983 first_mb_in_slice= get_ue_golomb(&s->gb); | |
| 2984 | |
| 2985 h->slice_type= get_ue_golomb(&s->gb); | |
| 2986 if(h->slice_type > 9){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
2987 av_log(h->s.avctx, AV_LOG_ERROR, "slice type too large (%d) at %d %d\n", h->slice_type, s->mb_x, s->mb_y); |
| 1168 | 2988 } |
| 2989 if(h->slice_type > 4){ | |
| 2990 h->slice_type -= 5; | |
| 2991 h->slice_type_fixed=1; | |
| 2992 }else | |
| 2993 h->slice_type_fixed=0; | |
| 2994 | |
| 2995 h->slice_type= slice_type_map[ h->slice_type ]; | |
| 2996 | |
| 2997 s->pict_type= h->slice_type; // to make a few old func happy, its wrong though | |
| 2998 | |
| 2999 pps_id= get_ue_golomb(&s->gb); | |
| 3000 if(pps_id>255){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3001 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n"); |
| 1168 | 3002 return -1; |
| 3003 } | |
| 3004 h->pps= h->pps_buffer[pps_id]; | |
| 1174 | 3005 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
|
3006 av_log(h->s.avctx, AV_LOG_ERROR, "non existing PPS referenced\n"); |
| 1174 | 3007 return -1; |
| 3008 } | |
| 3009 | |
| 1168 | 3010 h->sps= h->sps_buffer[ h->pps.sps_id ]; |
| 1174 | 3011 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
|
3012 av_log(h->s.avctx, AV_LOG_ERROR, "non existing SPS referenced\n"); |
| 1174 | 3013 return -1; |
| 3014 } | |
| 1168 | 3015 |
| 3016 s->mb_width= h->sps.mb_width; | |
| 3017 s->mb_height= h->sps.mb_height; | |
| 3018 | |
| 3019 h->b_stride= s->mb_width*4; | |
| 3020 h->b8_stride= s->mb_width*2; | |
| 3021 | |
| 3022 s->mb_x = first_mb_in_slice % s->mb_width; | |
| 3023 s->mb_y = first_mb_in_slice / s->mb_width; //FIXME AFFW | |
| 3024 | |
| 1371 | 3025 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right ); |
| 1168 | 3026 if(h->sps.frame_mbs_only_flag) |
| 1371 | 3027 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom); |
| 1168 | 3028 else |
| 1371 | 3029 s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck |
| 1168 | 3030 |
| 3031 if (s->context_initialized | |
| 1548 | 3032 && ( s->width != s->avctx->width || s->height != s->avctx->height)) { |
| 1168 | 3033 free_tables(h); |
| 3034 MPV_common_end(s); | |
| 3035 } | |
| 3036 if (!s->context_initialized) { | |
| 3037 if (MPV_common_init(s) < 0) | |
| 3038 return -1; | |
| 3039 | |
| 3040 alloc_tables(h); | |
| 3041 | |
| 3042 s->avctx->width = s->width; | |
| 3043 s->avctx->height = s->height; | |
| 1548 | 3044 s->avctx->sample_aspect_ratio= h->sps.sar; |
|
2174
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
3045 |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
3046 if(h->sps.timing_info_present_flag && h->sps.fixed_frame_rate_flag){ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
3047 s->avctx->frame_rate = h->sps.time_scale; |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
3048 s->avctx->frame_rate_base = h->sps.num_units_in_tick; |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
3049 } |
| 1168 | 3050 } |
| 3051 | |
| 3052 if(first_mb_in_slice == 0){ | |
| 3053 frame_start(h); | |
| 3054 } | |
| 3055 | |
| 1169 | 3056 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup |
| 1168 | 3057 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num); |
| 3058 | |
| 3059 if(h->sps.frame_mbs_only_flag){ | |
| 3060 s->picture_structure= PICT_FRAME; | |
| 3061 }else{ | |
| 3062 if(get_bits1(&s->gb)) //field_pic_flag | |
| 3063 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag | |
| 3064 else | |
| 3065 s->picture_structure= PICT_FRAME; | |
| 3066 } | |
| 3067 | |
| 3068 if(s->picture_structure==PICT_FRAME){ | |
| 3069 h->curr_pic_num= h->frame_num; | |
| 3070 h->max_pic_num= 1<< h->sps.log2_max_frame_num; | |
| 3071 }else{ | |
| 3072 h->curr_pic_num= 2*h->frame_num; | |
| 3073 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); | |
| 3074 } | |
| 3075 | |
| 3076 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 1453 | 3077 get_ue_golomb(&s->gb); /* idr_pic_id */ |
| 1168 | 3078 } |
| 3079 | |
| 3080 if(h->sps.poc_type==0){ | |
| 3081 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb); | |
| 3082 | |
| 3083 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){ | |
| 3084 h->delta_poc_bottom= get_se_golomb(&s->gb); | |
| 3085 } | |
| 3086 } | |
| 3087 | |
| 3088 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){ | |
| 3089 h->delta_poc[0]= get_se_golomb(&s->gb); | |
| 3090 | |
| 3091 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME) | |
| 3092 h->delta_poc[1]= get_se_golomb(&s->gb); | |
| 3093 } | |
| 3094 | |
| 3095 init_poc(h); | |
| 3096 | |
| 3097 if(h->pps.redundant_pic_cnt_present){ | |
| 3098 h->redundant_pic_count= get_ue_golomb(&s->gb); | |
| 3099 } | |
| 3100 | |
| 3101 //set defaults, might be overriden a few line later | |
| 3102 h->ref_count[0]= h->pps.ref_count[0]; | |
| 3103 h->ref_count[1]= h->pps.ref_count[1]; | |
| 3104 | |
| 3105 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){ | |
| 3106 if(h->slice_type == B_TYPE){ | |
| 3107 h->direct_spatial_mv_pred= get_bits1(&s->gb); | |
| 3108 } | |
| 3109 num_ref_idx_active_override_flag= get_bits1(&s->gb); | |
| 3110 | |
| 3111 if(num_ref_idx_active_override_flag){ | |
| 3112 h->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
| 3113 if(h->slice_type==B_TYPE) | |
| 3114 h->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
| 3115 | |
| 3116 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
|
3117 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n"); |
| 1168 | 3118 return -1; |
| 3119 } | |
| 3120 } | |
| 3121 } | |
| 3122 | |
| 3123 if(first_mb_in_slice == 0){ | |
| 3124 fill_default_ref_list(h); | |
| 3125 } | |
| 3126 | |
| 3127 decode_ref_pic_list_reordering(h); | |
| 3128 | |
| 3129 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE )) | |
| 3130 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) ) | |
| 3131 pred_weight_table(h); | |
| 3132 | |
| 3133 if(s->current_picture.reference) | |
| 3134 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
|
3135 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3136 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
|
3137 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
|
3138 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3139 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
|
3140 s->qscale = h->pps.init_qp + get_se_golomb(&s->gb); |
| 1898 | 3141 if(s->qscale<0 || s->qscale>51){ |
| 3142 av_log(s->avctx, AV_LOG_ERROR, "QP %d out of range\n", s->qscale); | |
| 3143 return -1; | |
| 3144 } | |
| 1168 | 3145 //FIXME qscale / qp ... stuff |
| 3146 if(h->slice_type == SP_TYPE){ | |
| 1453 | 3147 get_bits1(&s->gb); /* sp_for_switch_flag */ |
| 1168 | 3148 } |
| 3149 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){ | |
| 1453 | 3150 get_se_golomb(&s->gb); /* slice_qs_delta */ |
| 1168 | 3151 } |
| 3152 | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3153 h->deblocking_filter = 1; |
| 1898 | 3154 h->slice_alpha_c0_offset = 0; |
| 3155 h->slice_beta_offset = 0; | |
| 1168 | 3156 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
|
3157 h->deblocking_filter= get_ue_golomb(&s->gb); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3158 if(h->deblocking_filter < 2) |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3159 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
|
3160 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3161 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
|
3162 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
|
3163 h->slice_beta_offset = get_se_golomb(&s->gb) << 1; |
| 1168 | 3164 } |
|
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
|
3165 } |
| 1168 | 3166 |
| 3167 #if 0 //FMO | |
| 3168 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5) | |
| 3169 slice_group_change_cycle= get_bits(&s->gb, ?); | |
| 3170 #endif | |
| 3171 | |
| 3172 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3173 av_log(h->s.avctx, AV_LOG_DEBUG, "mb:%d %c pps:%d frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d\n", |
| 1168 | 3174 first_mb_in_slice, |
| 1264 | 3175 av_get_pict_type_char(h->slice_type), |
| 1168 | 3176 pps_id, h->frame_num, |
| 3177 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], | |
| 3178 h->ref_count[0], h->ref_count[1], | |
| 3179 s->qscale, | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3180 h->deblocking_filter |
| 1168 | 3181 ); |
| 3182 } | |
| 3183 | |
| 3184 return 0; | |
| 3185 } | |
| 3186 | |
| 3187 /** | |
| 3188 * | |
| 3189 */ | |
| 3190 static inline int get_level_prefix(GetBitContext *gb){ | |
| 3191 unsigned int buf; | |
| 3192 int log; | |
| 3193 | |
| 3194 OPEN_READER(re, gb); | |
| 3195 UPDATE_CACHE(re, gb); | |
| 3196 buf=GET_CACHE(re, gb); | |
| 3197 | |
| 3198 log= 32 - av_log2(buf); | |
| 3199 #ifdef TRACE | |
| 3200 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
|
3201 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 | 3202 #endif |
| 3203 | |
| 3204 LAST_SKIP_BITS(re, gb, log); | |
| 3205 CLOSE_READER(re, gb); | |
| 3206 | |
| 3207 return log-1; | |
| 3208 } | |
| 3209 | |
| 3210 /** | |
| 3211 * decodes a residual block. | |
| 3212 * @param n block index | |
| 3213 * @param scantable scantable | |
| 3214 * @param max_coeff number of coefficients in the block | |
| 3215 * @return <0 if an error occured | |
| 3216 */ | |
| 3217 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, int qp, int max_coeff){ | |
| 3218 MpegEncContext * const s = &h->s; | |
| 3219 const uint16_t *qmul= dequant_coeff[qp]; | |
| 3220 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}; | |
| 3221 int level[16], run[16]; | |
| 3222 int suffix_length, zeros_left, coeff_num, coeff_token, total_coeff, i, trailing_ones; | |
| 3223 | |
| 3224 //FIXME put trailing_onex into the context | |
| 3225 | |
| 3226 if(n == CHROMA_DC_BLOCK_INDEX){ | |
| 3227 coeff_token= get_vlc2(gb, chroma_dc_coeff_token_vlc.table, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 1); | |
| 3228 total_coeff= coeff_token>>2; | |
| 3229 }else{ | |
| 3230 if(n == LUMA_DC_BLOCK_INDEX){ | |
| 3231 total_coeff= pred_non_zero_count(h, 0); | |
| 3232 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
| 3233 total_coeff= coeff_token>>2; | |
| 3234 }else{ | |
| 3235 total_coeff= pred_non_zero_count(h, n); | |
| 3236 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
| 3237 total_coeff= coeff_token>>2; | |
| 3238 h->non_zero_count_cache[ scan8[n] ]= total_coeff; | |
| 3239 } | |
| 3240 } | |
| 3241 | |
| 3242 //FIXME set last_non_zero? | |
| 3243 | |
| 3244 if(total_coeff==0) | |
| 3245 return 0; | |
| 3246 | |
| 3247 trailing_ones= coeff_token&3; | |
| 1170 | 3248 tprintf("trailing:%d, total:%d\n", trailing_ones, total_coeff); |
| 1168 | 3249 assert(total_coeff<=16); |
| 3250 | |
| 3251 for(i=0; i<trailing_ones; i++){ | |
| 3252 level[i]= 1 - 2*get_bits1(gb); | |
| 3253 } | |
| 3254 | |
| 3255 suffix_length= total_coeff > 10 && trailing_ones < 3; | |
| 3256 | |
| 3257 for(; i<total_coeff; i++){ | |
| 3258 const int prefix= get_level_prefix(gb); | |
| 3259 int level_code, mask; | |
| 3260 | |
| 3261 if(prefix<14){ //FIXME try to build a large unified VLC table for all this | |
| 3262 if(suffix_length) | |
| 3263 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
| 3264 else | |
| 3265 level_code= (prefix<<suffix_length); //part | |
| 3266 }else if(prefix==14){ | |
| 3267 if(suffix_length) | |
| 3268 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
| 3269 else | |
| 3270 level_code= prefix + get_bits(gb, 4); //part | |
| 3271 }else if(prefix==15){ | |
| 3272 level_code= (prefix<<suffix_length) + get_bits(gb, 12); //part | |
| 3273 if(suffix_length==0) level_code+=15; //FIXME doesnt make (much)sense | |
| 3274 }else{ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3275 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 3276 return -1; |
| 3277 } | |
| 3278 | |
| 3279 if(i==trailing_ones && i<3) level_code+= 2; //FIXME split first iteration | |
| 3280 | |
| 3281 mask= -(level_code&1); | |
| 3282 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
| 3283 | |
| 3284 if(suffix_length==0) suffix_length=1; //FIXME split first iteration | |
| 3285 | |
| 3286 #if 1 | |
| 3287 if(ABS(level[i]) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++; | |
| 3288 #else | |
| 3289 if((2+level_code)>>1) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++; | |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
3290 /* ? == prefix > 2 or sth */ |
| 1168 | 3291 #endif |
| 1170 | 3292 tprintf("level: %d suffix_length:%d\n", level[i], suffix_length); |
| 1168 | 3293 } |
| 3294 | |
| 3295 if(total_coeff == max_coeff) | |
| 3296 zeros_left=0; | |
| 3297 else{ | |
| 3298 if(n == CHROMA_DC_BLOCK_INDEX) | |
| 3299 zeros_left= get_vlc2(gb, chroma_dc_total_zeros_vlc[ total_coeff-1 ].table, CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 1); | |
| 3300 else | |
| 3301 zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1); | |
| 3302 } | |
| 3303 | |
| 3304 for(i=0; i<total_coeff-1; i++){ | |
| 3305 if(zeros_left <=0) | |
| 3306 break; | |
| 3307 else if(zeros_left < 7){ | |
| 3308 run[i]= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
| 3309 }else{ | |
| 3310 run[i]= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
| 3311 } | |
| 3312 zeros_left -= run[i]; | |
| 3313 } | |
| 3314 | |
| 3315 if(zeros_left<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3316 av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 3317 return -1; |
| 3318 } | |
| 3319 | |
| 3320 for(; i<total_coeff-1; i++){ | |
| 3321 run[i]= 0; | |
| 3322 } | |
| 3323 | |
| 3324 run[i]= zeros_left; | |
| 3325 | |
| 3326 coeff_num=-1; | |
| 3327 if(n > 24){ | |
| 3328 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
| 3329 int j; | |
| 3330 | |
| 3331 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
| 3332 j= scantable[ coeff_num ]; | |
| 3333 | |
| 3334 block[j]= level[i]; | |
| 3335 } | |
| 3336 }else{ | |
| 3337 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
| 3338 int j; | |
| 3339 | |
| 3340 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
| 3341 j= scantable[ coeff_num ]; | |
| 3342 | |
| 3343 block[j]= level[i] * qmul[j]; | |
| 3344 // printf("%d %d ", block[j], qmul[j]); | |
| 3345 } | |
| 3346 } | |
| 3347 return 0; | |
| 3348 } | |
| 3349 | |
| 3350 /** | |
| 3351 * decodes a macroblock | |
| 3352 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed | |
| 3353 */ | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3354 static int decode_mb_cavlc(H264Context *h){ |
| 1168 | 3355 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
|
3356 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1169 | 3357 int mb_type, partition_count, cbp; |
| 1168 | 3358 |
| 1252 | 3359 s->dsp.clear_blocks(h->mb); //FIXME avoid if allready clear (move after skip handlong? |
| 1168 | 3360 |
| 1170 | 3361 tprintf("pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
| 1453 | 3362 cbp = 0; /* avoid warning. FIXME: find a solution without slowing |
| 3363 down the code */ | |
| 1168 | 3364 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){ |
| 3365 if(s->mb_skip_run==-1) | |
| 3366 s->mb_skip_run= get_ue_golomb(&s->gb); | |
| 3367 | |
| 3368 if (s->mb_skip_run--) { | |
| 1187 | 3369 int mx, my; |
| 1168 | 3370 /* skip mb */ |
| 3371 //FIXME b frame | |
| 3372 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0; | |
| 3373 | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3374 memset(h->non_zero_count[mb_xy], 0, 16); |
| 1168 | 3375 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui |
| 3376 | |
| 3377 if(h->sps.mb_aff && s->mb_skip_run==0 && (s->mb_y&1)==0){ | |
| 3378 h->mb_field_decoding_flag= get_bits1(&s->gb); | |
| 3379 } | |
| 3380 | |
| 3381 if(h->mb_field_decoding_flag) | |
| 3382 mb_type|= MB_TYPE_INTERLACED; | |
| 3383 | |
| 3384 fill_caches(h, mb_type); //FIXME check what is needed and what not ... | |
| 3385 pred_pskip_motion(h, &mx, &my); | |
| 3386 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
| 1269 | 3387 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); |
| 1168 | 3388 write_back_motion(h, mb_type); |
| 3389 | |
| 3390 s->current_picture.mb_type[mb_xy]= mb_type; //FIXME SKIP type | |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
3391 s->current_picture.qscale_table[mb_xy]= s->qscale; |
| 1168 | 3392 h->slice_table[ mb_xy ]= h->slice_num; |
| 3393 | |
| 3394 h->prev_mb_skiped= 1; | |
| 3395 return 0; | |
| 3396 } | |
| 3397 } | |
| 3398 if(h->sps.mb_aff /* && !field pic FIXME needed? */){ | |
| 3399 if((s->mb_y&1)==0) | |
| 3400 h->mb_field_decoding_flag = get_bits1(&s->gb); | |
| 3401 }else | |
| 3402 h->mb_field_decoding_flag=0; //FIXME som ed note ?! | |
| 3403 | |
| 3404 h->prev_mb_skiped= 0; | |
| 3405 | |
| 3406 mb_type= get_ue_golomb(&s->gb); | |
| 3407 if(h->slice_type == B_TYPE){ | |
| 3408 if(mb_type < 23){ | |
| 3409 partition_count= b_mb_type_info[mb_type].partition_count; | |
| 3410 mb_type= b_mb_type_info[mb_type].type; | |
| 3411 }else{ | |
| 3412 mb_type -= 23; | |
| 3413 goto decode_intra_mb; | |
| 3414 } | |
| 3415 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){ | |
| 3416 if(mb_type < 5){ | |
| 3417 partition_count= p_mb_type_info[mb_type].partition_count; | |
| 3418 mb_type= p_mb_type_info[mb_type].type; | |
| 3419 }else{ | |
| 3420 mb_type -= 5; | |
| 3421 goto decode_intra_mb; | |
| 3422 } | |
| 3423 }else{ | |
| 3424 assert(h->slice_type == I_TYPE); | |
| 3425 decode_intra_mb: | |
| 3426 if(mb_type > 25){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3427 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 | 3428 return -1; |
| 3429 } | |
| 3430 partition_count=0; | |
| 3431 cbp= i_mb_type_info[mb_type].cbp; | |
| 3432 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; | |
| 3433 mb_type= i_mb_type_info[mb_type].type; | |
| 3434 } | |
| 3435 | |
| 3436 if(h->mb_field_decoding_flag) | |
| 3437 mb_type |= MB_TYPE_INTERLACED; | |
| 3438 | |
| 3439 s->current_picture.mb_type[mb_xy]= mb_type; | |
| 3440 h->slice_table[ mb_xy ]= h->slice_num; | |
| 3441 | |
| 3442 if(IS_INTRA_PCM(mb_type)){ | |
| 3443 const uint8_t *ptr; | |
| 1187 | 3444 int x, y; |
| 1168 | 3445 |
| 3446 // we assume these blocks are very rare so we dont optimize it | |
| 3447 align_get_bits(&s->gb); | |
| 3448 | |
| 3449 ptr= s->gb.buffer + get_bits_count(&s->gb); | |
| 3450 | |
| 3451 for(y=0; y<16; y++){ | |
| 3452 const int index= 4*(y&3) + 64*(y>>2); | |
| 3453 for(x=0; x<16; x++){ | |
| 3454 h->mb[index + (x&3) + 16*(x>>2)]= *(ptr++); | |
| 3455 } | |
| 3456 } | |
| 3457 for(y=0; y<8; y++){ | |
| 3458 const int index= 256 + 4*(y&3) + 32*(y>>2); | |
| 3459 for(x=0; x<8; x++){ | |
| 3460 h->mb[index + (x&3) + 16*(x>>2)]= *(ptr++); | |
| 3461 } | |
| 3462 } | |
| 3463 for(y=0; y<8; y++){ | |
| 3464 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); | |
| 3465 for(x=0; x<8; x++){ | |
| 3466 h->mb[index + (x&3) + 16*(x>>2)]= *(ptr++); | |
| 3467 } | |
| 3468 } | |
| 3469 | |
| 3470 skip_bits(&s->gb, 384); //FIXME check /fix the bitstream readers | |
| 3471 | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3472 //FIXME deblock filter, non_zero_count_cache init ... |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3473 memset(h->non_zero_count[mb_xy], 16, 16); |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
3474 s->current_picture.qscale_table[mb_xy]= s->qscale; |
| 1168 | 3475 |
| 3476 return 0; | |
| 3477 } | |
| 3478 | |
| 3479 fill_caches(h, mb_type); | |
| 3480 | |
| 3481 //mb_pred | |
| 3482 if(IS_INTRA(mb_type)){ | |
| 3483 // init_top_left_availability(h); | |
| 3484 if(IS_INTRA4x4(mb_type)){ | |
| 3485 int i; | |
| 3486 | |
| 3487 // fill_intra4x4_pred_table(h); | |
| 3488 for(i=0; i<16; i++){ | |
| 3489 const int mode_coded= !get_bits1(&s->gb); | |
| 3490 const int predicted_mode= pred_intra_mode(h, i); | |
| 3491 int mode; | |
| 3492 | |
| 3493 if(mode_coded){ | |
| 3494 const int rem_mode= get_bits(&s->gb, 3); | |
| 3495 if(rem_mode<predicted_mode) | |
| 3496 mode= rem_mode; | |
| 3497 else | |
| 3498 mode= rem_mode + 1; | |
| 3499 }else{ | |
| 3500 mode= predicted_mode; | |
| 3501 } | |
| 3502 | |
| 3503 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode; | |
| 3504 } | |
| 3505 write_back_intra_pred_mode(h); | |
| 3506 if( check_intra4x4_pred_mode(h) < 0) | |
| 3507 return -1; | |
| 3508 }else{ | |
| 3509 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode); | |
| 3510 if(h->intra16x16_pred_mode < 0) | |
| 3511 return -1; | |
| 3512 } | |
| 3513 h->chroma_pred_mode= get_ue_golomb(&s->gb); | |
| 3514 | |
| 3515 h->chroma_pred_mode= check_intra_pred_mode(h, h->chroma_pred_mode); | |
| 3516 if(h->chroma_pred_mode < 0) | |
| 3517 return -1; | |
| 3518 }else if(partition_count==4){ | |
| 3519 int i, j, sub_partition_count[4], list, ref[2][4]; | |
| 3520 | |
| 3521 if(h->slice_type == B_TYPE){ | |
| 3522 for(i=0; i<4; i++){ | |
| 3523 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
| 3524 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
|
3525 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 | 3526 return -1; |
| 3527 } | |
| 3528 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
| 3529 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
| 3530 } | |
| 3531 }else{ | |
| 3532 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ? | |
| 3533 for(i=0; i<4; i++){ | |
| 3534 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
| 3535 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
|
3536 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 | 3537 return -1; |
| 3538 } | |
| 3539 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
| 3540 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
| 3541 } | |
| 3542 } | |
| 3543 | |
| 3544 for(list=0; list<2; list++){ | |
| 3545 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; | |
| 3546 if(ref_count == 0) continue; | |
| 3547 for(i=0; i<4; i++){ | |
| 3548 if(IS_DIR(h->sub_mb_type[i], 0, list) && !IS_DIRECT(h->sub_mb_type[i])){ | |
| 3549 ref[list][i] = get_te0_golomb(&s->gb, ref_count); //FIXME init to 0 before and skip? | |
| 3550 }else{ | |
| 3551 //FIXME | |
| 3552 ref[list][i] = -1; | |
| 3553 } | |
| 3554 } | |
| 3555 } | |
| 3556 | |
| 3557 for(list=0; list<2; list++){ | |
| 3558 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; | |
| 3559 if(ref_count == 0) continue; | |
| 3560 | |
| 3561 for(i=0; i<4; i++){ | |
| 3562 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]= | |
| 3563 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i]; | |
| 3564 | |
| 3565 if(IS_DIR(h->sub_mb_type[i], 0, list) && !IS_DIRECT(h->sub_mb_type[i])){ | |
| 3566 const int sub_mb_type= h->sub_mb_type[i]; | |
| 3567 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1; | |
| 3568 for(j=0; j<sub_partition_count[i]; j++){ | |
| 3569 int mx, my; | |
| 3570 const int index= 4*i + block_width*j; | |
| 3571 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ]; | |
| 3572 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my); | |
| 3573 mx += get_se_golomb(&s->gb); | |
| 3574 my += get_se_golomb(&s->gb); | |
| 1170 | 3575 tprintf("final mv:%d %d\n", mx, my); |
| 3576 | |
| 1168 | 3577 if(IS_SUB_8X8(sub_mb_type)){ |
| 3578 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= | |
| 3579 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; | |
| 3580 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= | |
| 3581 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my; | |
| 3582 }else if(IS_SUB_8X4(sub_mb_type)){ | |
| 3583 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx; | |
| 3584 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my; | |
| 3585 }else if(IS_SUB_4X8(sub_mb_type)){ | |
| 3586 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx; | |
| 3587 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my; | |
| 3588 }else{ | |
| 3589 assert(IS_SUB_4X4(sub_mb_type)); | |
| 3590 mv_cache[ 0 ][0]= mx; | |
| 3591 mv_cache[ 0 ][1]= my; | |
| 3592 } | |
| 3593 } | |
| 3594 }else{ | |
| 3595 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0]; | |
| 3596 p[0] = p[1]= | |
| 3597 p[8] = p[9]= 0; | |
| 3598 } | |
| 3599 } | |
| 3600 } | |
| 3601 }else if(!IS_DIRECT(mb_type)){ | |
| 3602 int list, mx, my, i; | |
| 3603 //FIXME we should set ref_idx_l? to 0 if we use that later ... | |
| 3604 if(IS_16X16(mb_type)){ | |
| 3605 for(list=0; list<2; list++){ | |
| 3606 if(h->ref_count[0]>0){ | |
| 3607 if(IS_DIR(mb_type, 0, list)){ | |
| 3608 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
| 3609 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | |
| 3610 } | |
| 3611 } | |
| 3612 } | |
| 3613 for(list=0; list<2; list++){ | |
| 3614 if(IS_DIR(mb_type, 0, list)){ | |
| 3615 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); | |
| 3616 mx += get_se_golomb(&s->gb); | |
| 3617 my += get_se_golomb(&s->gb); | |
| 1170 | 3618 tprintf("final mv:%d %d\n", mx, my); |
| 3619 | |
| 1269 | 3620 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
| 1168 | 3621 } |
| 3622 } | |
| 3623 } | |
| 3624 else if(IS_16X8(mb_type)){ | |
| 3625 for(list=0; list<2; list++){ | |
| 3626 if(h->ref_count[list]>0){ | |
| 3627 for(i=0; i<2; i++){ | |
| 3628 if(IS_DIR(mb_type, i, list)){ | |
| 3629 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
| 3630 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); | |
| 3631 } | |
| 3632 } | |
| 3633 } | |
| 3634 } | |
| 3635 for(list=0; list<2; list++){ | |
| 3636 for(i=0; i<2; i++){ | |
| 3637 if(IS_DIR(mb_type, i, list)){ | |
| 3638 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my); | |
| 3639 mx += get_se_golomb(&s->gb); | |
| 3640 my += get_se_golomb(&s->gb); | |
| 1170 | 3641 tprintf("final mv:%d %d\n", mx, my); |
| 3642 | |
| 1269 | 3643 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
| 1168 | 3644 } |
| 3645 } | |
| 3646 } | |
| 3647 }else{ | |
| 3648 assert(IS_8X16(mb_type)); | |
| 3649 for(list=0; list<2; list++){ | |
| 3650 if(h->ref_count[list]>0){ | |
| 3651 for(i=0; i<2; i++){ | |
| 3652 if(IS_DIR(mb_type, i, list)){ //FIXME optimize | |
| 3653 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
| 3654 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); | |
| 3655 } | |
| 3656 } | |
| 3657 } | |
| 3658 } | |
| 3659 for(list=0; list<2; list++){ | |
| 3660 for(i=0; i<2; i++){ | |
| 3661 if(IS_DIR(mb_type, i, list)){ | |
| 3662 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my); | |
| 3663 mx += get_se_golomb(&s->gb); | |
| 3664 my += get_se_golomb(&s->gb); | |
| 1170 | 3665 tprintf("final mv:%d %d\n", mx, my); |
| 3666 | |
| 1269 | 3667 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
| 1168 | 3668 } |
| 3669 } | |
| 3670 } | |
| 3671 } | |
| 3672 } | |
| 3673 | |
| 3674 if(IS_INTER(mb_type)) | |
| 3675 write_back_motion(h, mb_type); | |
| 3676 | |
| 3677 if(!IS_INTRA16x16(mb_type)){ | |
| 3678 cbp= get_ue_golomb(&s->gb); | |
| 3679 if(cbp > 47){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3680 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%d) at %d %d\n", cbp, s->mb_x, s->mb_y); |
| 1168 | 3681 return -1; |
| 3682 } | |
| 3683 | |
| 3684 if(IS_INTRA4x4(mb_type)) | |
| 3685 cbp= golomb_to_intra4x4_cbp[cbp]; | |
| 3686 else | |
| 3687 cbp= golomb_to_inter_cbp[cbp]; | |
| 3688 } | |
| 3689 | |
| 3690 if(cbp || IS_INTRA16x16(mb_type)){ | |
| 3691 int i8x8, i4x4, chroma_idx; | |
| 3692 int chroma_qp, dquant; | |
| 3693 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr; | |
| 3694 const uint8_t *scan, *dc_scan; | |
| 3695 | |
| 3696 // fill_non_zero_count_cache(h); | |
| 3697 | |
| 3698 if(IS_INTERLACED(mb_type)){ | |
| 3699 scan= field_scan; | |
| 3700 dc_scan= luma_dc_field_scan; | |
| 3701 }else{ | |
| 3702 scan= zigzag_scan; | |
| 3703 dc_scan= luma_dc_zigzag_scan; | |
| 3704 } | |
| 3705 | |
| 3706 dquant= get_se_golomb(&s->gb); | |
| 3707 | |
| 3708 if( dquant > 25 || dquant < -26 ){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3709 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 | 3710 return -1; |
| 3711 } | |
| 3712 | |
| 3713 s->qscale += dquant; | |
| 3714 if(((unsigned)s->qscale) > 51){ | |
| 3715 if(s->qscale<0) s->qscale+= 52; | |
| 3716 else s->qscale-= 52; | |
| 3717 } | |
| 3718 | |
| 3719 h->chroma_qp= chroma_qp= get_chroma_qp(h, s->qscale); | |
| 3720 if(IS_INTRA16x16(mb_type)){ | |
| 3721 if( decode_residual(h, h->intra_gb_ptr, h->mb, LUMA_DC_BLOCK_INDEX, dc_scan, s->qscale, 16) < 0){ | |
| 3722 return -1; //FIXME continue if partotioned and other retirn -1 too | |
| 3723 } | |
| 3724 | |
| 3725 assert((cbp&15) == 0 || (cbp&15) == 15); | |
| 3726 | |
| 3727 if(cbp&15){ | |
| 3728 for(i8x8=0; i8x8<4; i8x8++){ | |
| 3729 for(i4x4=0; i4x4<4; i4x4++){ | |
| 3730 const int index= i4x4 + 4*i8x8; | |
| 3731 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, s->qscale, 15) < 0 ){ | |
| 3732 return -1; | |
| 3733 } | |
| 3734 } | |
| 3735 } | |
| 3736 }else{ | |
| 1636 | 3737 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1); |
| 1168 | 3738 } |
| 3739 }else{ | |
| 3740 for(i8x8=0; i8x8<4; i8x8++){ | |
| 3741 if(cbp & (1<<i8x8)){ | |
| 3742 for(i4x4=0; i4x4<4; i4x4++){ | |
| 3743 const int index= i4x4 + 4*i8x8; | |
| 3744 | |
| 3745 if( decode_residual(h, gb, h->mb + 16*index, index, scan, s->qscale, 16) <0 ){ | |
| 3746 return -1; | |
| 3747 } | |
| 3748 } | |
| 3749 }else{ | |
| 3750 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; | |
| 3751 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; | |
| 3752 } | |
| 3753 } | |
| 3754 } | |
| 3755 | |
| 3756 if(cbp&0x30){ | |
| 3757 for(chroma_idx=0; chroma_idx<2; chroma_idx++) | |
| 3758 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, chroma_qp, 4) < 0){ | |
| 3759 return -1; | |
| 3760 } | |
| 3761 } | |
| 3762 | |
| 3763 if(cbp&0x20){ | |
| 3764 for(chroma_idx=0; chroma_idx<2; chroma_idx++){ | |
| 3765 for(i4x4=0; i4x4<4; i4x4++){ | |
| 3766 const int index= 16 + 4*chroma_idx + i4x4; | |
| 3767 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, chroma_qp, 15) < 0){ | |
| 3768 return -1; | |
| 3769 } | |
| 3770 } | |
| 3771 } | |
| 3772 }else{ | |
| 3773 uint8_t * const nnz= &h->non_zero_count_cache[0]; | |
| 3774 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
| 3775 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
| 3776 } | |
| 3777 }else{ | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3778 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
|
3779 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
|
3780 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
|
3781 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; |
| 1168 | 3782 } |
|
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
|
3783 s->current_picture.qscale_table[mb_xy]= s->qscale; |
| 1168 | 3784 write_back_non_zero_count(h); |
| 3785 | |
| 3786 return 0; | |
| 3787 } | |
| 3788 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3789 static int decode_cabac_mb_type( H264Context *h ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3790 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
|
3791 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3792 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
|
3793 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
|
3794 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
|
3795 int mb_type; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3796 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3797 if( s->mb_x > 0 && !IS_INTRA4x4( s->current_picture.mb_type[mb_xy-1] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3798 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3799 if( s->mb_y > 0 && !IS_INTRA4x4( s->current_picture.mb_type[mb_xy-s->mb_stride] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3800 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3801 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3802 if( get_cabac( &h->cabac, &h->cabac_state[3+ctx] ) == 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3803 return 0; /* I4x4 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3804 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3805 if( get_cabac_terminate( &h->cabac ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3806 return 25; /* PCM */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3807 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3808 mb_type = 1; /* I16x16 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3809 if( get_cabac( &h->cabac, &h->cabac_state[3+3] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3810 mb_type += 12; /* cbp_luma != 0 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3811 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3812 if( get_cabac( &h->cabac, &h->cabac_state[3+4] ) ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3813 if( get_cabac( &h->cabac, &h->cabac_state[3+5] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3814 mb_type += 4 * 2; /* cbp_chroma == 2 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3815 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3816 mb_type += 4 * 1; /* cbp_chroma == 1 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3817 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3818 if( get_cabac( &h->cabac, &h->cabac_state[3+6] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3819 mb_type += 2; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3820 if( get_cabac( &h->cabac, &h->cabac_state[3+7] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3821 mb_type += 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3822 return mb_type; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3823 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3824 } 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
|
3825 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
|
3826 /* 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
|
3827 if( get_cabac( &h->cabac, &h->cabac_state[15] ) == 0 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3828 if( get_cabac( &h->cabac, &h->cabac_state[16] ) == 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3829 return 0; /* P_L0_D16x16; */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3830 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3831 return 3; /* P_8x8; */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3832 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3833 if( get_cabac( &h->cabac, &h->cabac_state[17] ) == 0 ) |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
3834 return 2; /* P_L0_D8x16; */ |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3835 else |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
3836 return 1; /* P_L0_D16x8; */ |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3837 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3838 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3839 int mb_type; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3840 /* 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
|
3841 if( get_cabac( &h->cabac, &h->cabac_state[17] ) == 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3842 return 5+0; /* I_4x4 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3843 if( get_cabac_terminate( &h->cabac ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3844 return 5+25; /*I_PCM */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3845 mb_type = 5+1; /* I16x16 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3846 if( get_cabac( &h->cabac, &h->cabac_state[17+1] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3847 mb_type += 12; /* cbp_luma != 0 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3848 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3849 if( get_cabac( &h->cabac, &h->cabac_state[17+2] ) ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3850 if( get_cabac( &h->cabac, &h->cabac_state[17+2] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3851 mb_type += 4 * 2; /* cbp_chroma == 2 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3852 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3853 mb_type += 4 * 1; /* cbp_chroma == 1 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3854 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3855 if( get_cabac( &h->cabac, &h->cabac_state[17+3] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3856 mb_type += 2; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3857 if( get_cabac( &h->cabac, &h->cabac_state[17+3] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3858 mb_type += 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3859 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3860 return 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
|
3861 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3862 } else if( h->slice_type == B_TYPE ) { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3863 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3864 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
|
3865 int bits; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3866 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3867 if( s->mb_x > 0 && !IS_SKIP( s->current_picture.mb_type[mb_xy-1] ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3868 && !IS_DIRECT( s->current_picture.mb_type[mb_xy-1] ) ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3869 ctx++; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3870 if( s->mb_y > 0 && !IS_SKIP( s->current_picture.mb_type[mb_xy-s->mb_stride] ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3871 && !IS_DIRECT( s->current_picture.mb_type[mb_xy-s->mb_stride] ) ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3872 ctx++; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3873 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3874 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
|
3875 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
|
3876 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3877 if( !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
|
3878 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
|
3879 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3880 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3881 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
|
3882 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
|
3883 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
|
3884 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
|
3885 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
|
3886 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
|
3887 else if( bits == 13 ) { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3888 int mb_type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3889 /* I-type */ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3890 if( get_cabac( &h->cabac, &h->cabac_state[32] ) == 0 ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3891 return 23+0; /* I_4x4 */ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3892 if( get_cabac_terminate( &h->cabac ) ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3893 return 23+25; /* I_PCM */ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3894 mb_type = 23+1; /* I_16x16 */ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3895 if( get_cabac( &h->cabac, &h->cabac_state[32+1] ) ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3896 mb_type += 12; /* cbp_luma != 0 */ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3897 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3898 if( get_cabac( &h->cabac, &h->cabac_state[32+2] ) ) { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3899 if( get_cabac( &h->cabac, &h->cabac_state[32+2] ) ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3900 mb_type += 4 * 2; /* cbp_chroma == 2 */ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3901 else |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3902 mb_type += 4 * 1; /* cbp_chroma == 1 */ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3903 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3904 if( get_cabac( &h->cabac, &h->cabac_state[32+3] ) ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3905 mb_type += 2; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3906 if( get_cabac( &h->cabac, &h->cabac_state[32+3] ) ) |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3907 mb_type += 1; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3908 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3909 return mb_type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3910 } 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
|
3911 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
|
3912 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
|
3913 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
|
3914 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3915 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
|
3916 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
|
3917 } else { |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
3918 /* 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
|
3919 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
|
3920 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3921 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3922 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3923 static int decode_cabac_mb_skip( H264Context *h) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3924 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
|
3925 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
|
3926 const int mba_xy = mb_xy - 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3927 const int mbb_xy = mb_xy - s->mb_stride; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3928 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
|
3929 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3930 if( s->mb_x > 0 && !IS_SKIP( s->current_picture.mb_type[mba_xy] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3931 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3932 if( s->mb_y > 0 && !IS_SKIP( s->current_picture.mb_type[mbb_xy] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3933 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3934 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3935 if( h->slice_type == P_TYPE || h->slice_type == SP_TYPE) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3936 return get_cabac( &h->cabac, &h->cabac_state[11+ctx] ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3937 else /* B-frame */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3938 return get_cabac( &h->cabac, &h->cabac_state[24+ctx] ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3939 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3940 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3941 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
|
3942 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
|
3943 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3944 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
|
3945 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
|
3946 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3947 if( get_cabac( &h->cabac, &h->cabac_state[69] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3948 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
|
3949 if( get_cabac( &h->cabac, &h->cabac_state[69] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3950 mode += 2; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3951 if( get_cabac( &h->cabac, &h->cabac_state[69] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3952 mode += 4; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3953 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
|
3954 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
|
3955 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3956 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
|
3957 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3958 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3959 static int decode_cabac_mb_chroma_pre_mode( H264Context *h) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3960 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
|
3961 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
|
3962 const int mba_xy = mb_xy - 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3963 const int mbb_xy = mb_xy - s->mb_stride; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3964 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3965 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
|
3966 |
|
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
|
3967 /* No need to test for IS_INTRA4x4 and IS_INTRA16x16, as we set chroma_pred_mode_table to 0 */ |
|
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
3968 if( s->mb_x > 0 && h->chroma_pred_mode_table[mba_xy] != 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3969 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
|
3970 |
|
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
|
3971 if( s->mb_y > 0 && h->chroma_pred_mode_table[mbb_xy] != 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3972 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3973 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3974 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
|
3975 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
|
3976 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3977 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
|
3978 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
|
3979 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
|
3980 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
|
3981 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3982 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
|
3983 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3984 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3985 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
|
3986 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
|
3987 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3988 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
|
3989 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
|
3990 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3991 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
|
3992 { 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
|
3993 { 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
|
3994 { 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
|
3995 { 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
|
3996 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3997 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3998 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
|
3999 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
|
4000 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
|
4001 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4002 int cbp = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4003 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
|
4004 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4005 h->cbp_table[mb_xy] = 0; /* FIXME aaahahahah beurk */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4006 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4007 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
|
4008 int mba_xy = -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4009 int mbb_xy = -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4010 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
|
4011 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
|
4012 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4013 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
|
4014 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
|
4015 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4016 if( 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
|
4017 mba_xy = mb_xy; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4018 else if( s->mb_x > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4019 mba_xy = mb_xy - 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4020 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4021 if( y > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4022 mbb_xy = mb_xy; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4023 else if( s->mb_y > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4024 mbb_xy = mb_xy - s->mb_stride; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4025 |
|
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
|
4026 /* No need to test for skip as we put 0 for skip block */ |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4027 if( mba_xy >= 0 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4028 int i8x8a = block_idx_xy[(x-1)&0x03][y]/4; |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4029 if( ((h->cbp_table[mba_xy] >> i8x8a)&0x01) == 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4030 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4031 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4032 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4033 if( mbb_xy >= 0 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4034 int i8x8b = block_idx_xy[x][(y-1)&0x03]/4; |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4035 if( ((h->cbp_table[mbb_xy] >> i8x8b)&0x01) == 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4036 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
|
4037 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4038 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4039 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
|
4040 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
|
4041 h->cbp_table[mb_xy] = cbp; /* FIXME aaahahahah beurk */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4042 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4043 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4044 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
|
4045 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4046 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
|
4047 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
|
4048 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
|
4049 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
|
4050 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
|
4051 |
|
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
|
4052 /* No need to test for skip */ |
|
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4053 if( s->mb_x > 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4054 cbp_a = (h->cbp_table[mb_xy-1]>>4)&0x03; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4055 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4056 cbp_a = -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4057 |
|
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
|
4058 if( s->mb_y > 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4059 cbp_b = (h->cbp_table[mb_xy-s->mb_stride]>>4)&0x03; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4060 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4061 cbp_b = -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4062 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4063 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
|
4064 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
|
4065 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
|
4066 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
|
4067 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
|
4068 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4069 ctx = 4; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4070 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
|
4071 if( cbp_b == 2 ) ctx += 2; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4072 if( get_cabac( &h->cabac, &h->cabac_state[77 + ctx] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4073 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
|
4074 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4075 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
|
4076 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4077 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
|
4078 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
|
4079 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
|
4080 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
|
4081 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
|
4082 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4083 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
|
4084 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
|
4085 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4086 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
|
4087 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4088 if( mbn_xy >= 0 && h->last_qscale_diff != 0 && ( IS_INTRA16x16(s->current_picture.mb_type[mbn_xy] ) || (h->cbp_table[mbn_xy]&0x3f) ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4089 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4090 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4091 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
|
4092 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
|
4093 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
|
4094 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4095 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
|
4096 val++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4097 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4098 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4099 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
|
4100 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
|
4101 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4102 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
|
4103 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4104 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
|
4105 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
|
4106 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
|
4107 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
|
4108 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
|
4109 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
|
4110 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
|
4111 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
|
4112 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4113 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
|
4114 int type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4115 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
|
4116 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
|
4117 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
|
4118 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
|
4119 type = 3; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4120 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
|
4121 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
|
4122 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
|
4123 type += 4; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4124 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4125 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
|
4126 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
|
4127 return type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4128 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4129 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4130 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
|
4131 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
|
4132 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
|
4133 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
|
4134 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
|
4135 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4136 if( refa > 0 ) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4137 ctx++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4138 if( refb > 0 ) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4139 ctx += 2; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4140 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4141 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
|
4142 ref++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4143 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
|
4144 ctx = 4; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4145 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4146 ctx = 5; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4147 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4148 return ref; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4149 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4150 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4151 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
|
4152 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
|
4153 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
|
4154 int ctxbase = (l == 0) ? 40 : 47; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4155 int ctx; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4156 int mvd = 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4157 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4158 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
|
4159 ctx = 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4160 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
|
4161 ctx = 2; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4162 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4163 ctx = 1; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4164 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4165 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
|
4166 mvd++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4167 if( ctx < 3 ) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4168 ctx = 3; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4169 else if( ctx < 6 ) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4170 ctx++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4171 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4172 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4173 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
|
4174 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
|
4175 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
|
4176 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
|
4177 k++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4178 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4179 while( k-- ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4180 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
|
4181 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
|
4182 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4183 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4184 if( mvd != 0 && get_cabac_bypass( &h->cabac ) ) |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4185 return -mvd; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4186 return mvd; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4187 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4188 |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4189 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4190 static int get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4191 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
|
4192 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
|
4193 int mba_xy = -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4194 int mbb_xy = -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4195 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4196 int nza = -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4197 int nzb = -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4198 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
|
4199 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4200 if( cat == 0 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4201 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
|
4202 mba_xy = mb_xy - 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4203 if( IS_INTRA16x16(s->current_picture.mb_type[mba_xy] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4204 nza = h->cbp_table[mba_xy]&0x100; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4205 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4206 if( s->mb_y > 0 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4207 mbb_xy = mb_xy - s->mb_stride; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4208 if( IS_INTRA16x16(s->current_picture.mb_type[mbb_xy] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4209 nzb = h->cbp_table[mbb_xy]&0x100; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4210 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4211 } else if( 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
|
4212 int i8x8a, i8x8b; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4213 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
|
4214 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4215 x = block_idx_x[idx]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4216 y = block_idx_y[idx]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4217 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4218 if( x > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4219 mba_xy = mb_xy; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4220 else if( s->mb_x > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4221 mba_xy = mb_xy - 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4222 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4223 if( y > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4224 mbb_xy = mb_xy; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4225 else if( s->mb_y > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4226 mbb_xy = mb_xy - s->mb_stride; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4227 |
|
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
|
4228 /* No need to test for skip */ |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4229 if( mba_xy >= 0 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4230 i8x8a = block_idx_xy[(x-1)&0x03][y]/4; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4231 |
|
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
|
4232 if( !IS_INTRA_PCM(s->current_picture.mb_type[mba_xy] ) && |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4233 ((h->cbp_table[mba_xy]&0x0f)>>i8x8a)) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4234 nza = h->non_zero_count_cache[scan8[idx] - 1]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4235 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4236 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4237 if( mbb_xy >= 0 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4238 i8x8b = block_idx_xy[x][(y-1)&0x03]/4; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4239 |
|
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
|
4240 if( !IS_INTRA_PCM(s->current_picture.mb_type[mbb_xy] ) && |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4241 ((h->cbp_table[mbb_xy]&0x0f)>>i8x8b)) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4242 nzb = h->non_zero_count_cache[scan8[idx] - 8]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4243 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4244 } else if( cat == 3 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4245 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
|
4246 mba_xy = mb_xy - 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4247 |
|
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
|
4248 if( !IS_INTRA_PCM(s->current_picture.mb_type[mba_xy] ) && |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4249 (h->cbp_table[mba_xy]&0x30) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4250 nza = (h->cbp_table[mba_xy]>>(6+idx))&0x01; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4251 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4252 if( s->mb_y > 0 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4253 mbb_xy = mb_xy - s->mb_stride; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4254 |
|
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
|
4255 if( !IS_INTRA_PCM(s->current_picture.mb_type[mbb_xy] ) && |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4256 (h->cbp_table[mbb_xy]&0x30) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4257 nzb = (h->cbp_table[mbb_xy]>>(6+idx))&0x01; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4258 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4259 } else if( cat == 4 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4260 int idxc = idx % 4 ; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4261 if( idxc == 1 || idxc == 3 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4262 mba_xy = mb_xy; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4263 else if( s->mb_x > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4264 mba_xy = mb_xy -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4265 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4266 if( idxc == 2 || idxc == 3 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4267 mbb_xy = mb_xy; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4268 else if( s->mb_y > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4269 mbb_xy = mb_xy - s->mb_stride; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4270 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4271 if( mba_xy >= 0 && |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4272 !IS_INTRA_PCM(s->current_picture.mb_type[mba_xy] ) && |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4273 (h->cbp_table[mba_xy]&0x30) == 0x20 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4274 nza = h->non_zero_count_cache[scan8[16+idx] - 1]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4275 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4276 if( mbb_xy >= 0 && |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4277 !IS_INTRA_PCM(s->current_picture.mb_type[mbb_xy] ) && |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4278 (h->cbp_table[mbb_xy]&0x30) == 0x20 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4279 nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4280 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4281 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4282 if( ( mba_xy < 0 && IS_INTRA( s->current_picture.mb_type[mb_xy] ) ) || |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4283 ( mba_xy >= 0 && IS_INTRA_PCM(s->current_picture.mb_type[mba_xy] ) ) || |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4284 nza > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4285 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4286 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4287 if( ( mbb_xy < 0 && IS_INTRA( s->current_picture.mb_type[mb_xy] ) ) || |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4288 ( mbb_xy >= 0 && IS_INTRA_PCM(s->current_picture.mb_type[mbb_xy] ) ) || |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4289 nzb > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4290 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
|
4291 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4292 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
|
4293 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4294 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4295 static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, int qp, int max_coeff) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4296 const int mb_xy = h->s.mb_x + h->s.mb_y*h->s.mb_stride; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4297 const uint16_t *qmul= dequant_coeff[qp]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4298 static const int significant_coeff_flag_offset[5] = { 0, 15, 29, 44, 47 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4299 static const int last_significant_coeff_flag_offset[5] = { 0, 15, 29, 44, 47 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4300 static const int coeff_abs_level_m1_offset[5] = { 0, 10, 20, 30, 39 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4301 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4302 int coeff[16]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4303 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4304 int last = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4305 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
|
4306 int nz[16] = {0}; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4307 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
|
4308 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4309 int abslevel1 = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4310 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
|
4311 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4312 /* 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
|
4313 * 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
|
4314 * 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
|
4315 * 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
|
4316 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4317 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4318 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4319 /* read coded block flag */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4320 if( get_cabac( &h->cabac, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n ) ] ) == 0 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4321 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
|
4322 h->non_zero_count_cache[scan8[n]] = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4323 else if( cat == 4 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4324 h->non_zero_count_cache[scan8[16+n]] = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4325 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4326 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
|
4327 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4328 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4329 while( last < max_coeff - 1 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4330 int ctx = FFMIN( last, max_coeff - 2 ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4331 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4332 if( get_cabac( &h->cabac, &h->cabac_state[105+significant_coeff_flag_offset[cat]+ctx] ) == 0 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4333 nz[last++] = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4334 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4335 else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4336 nz[last++] = 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4337 coeff_count++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4338 if( get_cabac( &h->cabac, &h->cabac_state[166+last_significant_coeff_flag_offset[cat]+ctx] ) ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4339 while( last < max_coeff ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4340 nz[last++] = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4341 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4342 break; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4343 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4344 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4345 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4346 if( last == max_coeff -1 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4347 nz[last++] = 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4348 coeff_count++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4349 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4350 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4351 if( cat == 0 && coeff_count > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4352 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
|
4353 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
|
4354 h->non_zero_count_cache[scan8[n]] = coeff_count; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4355 else if( cat == 3 && coeff_count > 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4356 h->cbp_table[mb_xy] |= 0x40 << n; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4357 else if( cat == 4 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4358 h->non_zero_count_cache[scan8[16+n]] = coeff_count; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4359 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4360 for( i = coeff_count - 1; i >= 0; i-- ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4361 int coeff_abs_m1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4362 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4363 int ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 + 1 )) + coeff_abs_level_m1_offset[cat]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4364 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4365 if( get_cabac( &h->cabac, &h->cabac_state[227+ctx] ) == 0 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4366 coeff_abs_m1 = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4367 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4368 coeff_abs_m1 = 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4369 ctx = 5 + FFMIN( 4, abslevelgt1 ) + coeff_abs_level_m1_offset[cat]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4370 while( coeff_abs_m1 < 14 && get_cabac( &h->cabac, &h->cabac_state[227+ctx] ) ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4371 coeff_abs_m1++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4372 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4373 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4374 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4375 if( coeff_abs_m1 >= 14 ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4376 int j = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4377 while( get_cabac_bypass( &h->cabac ) ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4378 coeff_abs_m1 += 1 << j; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4379 j++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4380 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4381 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4382 while( j-- ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4383 if( get_cabac_bypass( &h->cabac ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4384 coeff_abs_m1 += 1 << j ; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4385 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4386 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4387 if( get_cabac_bypass( &h->cabac ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4388 coeff[i] = -1 *( coeff_abs_m1 + 1 ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4389 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4390 coeff[i] = coeff_abs_m1 + 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4391 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4392 if( coeff_abs_m1 == 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4393 abslevel1++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4394 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4395 abslevelgt1++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4396 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4397 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4398 if( cat == 0 || cat == 3 ) { /* DC */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4399 int j; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4400 for( i = 0, j = 0; j < coeff_count; i++ ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4401 if( nz[i] ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4402 block[scantable[i]] = coeff[j]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4403 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4404 j++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4405 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4406 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4407 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4408 } else { /* AC */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4409 int j; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4410 for( i = 0, j = 0; j < coeff_count; i++ ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4411 if( nz[i] ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4412 block[scantable[i]] = coeff[j] * qmul[scantable[i]]; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4413 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4414 j++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4415 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4416 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4417 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4418 return 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4419 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4420 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4421 /** |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4422 * 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
|
4423 * @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
|
4424 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4425 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
|
4426 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
|
4427 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
|
4428 int mb_type, partition_count, cbp = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4429 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4430 s->dsp.clear_blocks(h->mb); //FIXME avoid if allready clear (move after skip handlong?) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4431 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4432 if( h->sps.mb_aff ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4433 av_log( h->s.avctx, AV_LOG_ERROR, "Fields not supported with CABAC\n" ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4434 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
|
4435 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4436 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4437 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4438 /* read skip flags */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4439 if( decode_cabac_mb_skip( h ) ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4440 int mx, my; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4441 |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4442 //FIXME b frame |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4443 /* skip mb */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4444 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4445 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4446 memset(h->non_zero_count[mb_xy], 0, 16); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4447 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4448 #if 0 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4449 if(h->sps.mb_aff && s->mb_skip_run==0 && (s->mb_y&1)==0){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4450 h->mb_field_decoding_flag= get_bits1(&s->gb); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4451 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4452 if(h->mb_field_decoding_flag) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4453 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
|
4454 #endif |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4455 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4456 fill_caches(h, mb_type); //FIXME check what is needed and what not ... |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4457 pred_pskip_motion(h, &mx, &my); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4458 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4459 fill_rectangle( h->mvd_cache[0][scan8[0]], 4, 4, 8, pack16to32(0,0), 4); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4460 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4461 write_back_motion(h, mb_type); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4462 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4463 s->current_picture.mb_type[mb_xy]= mb_type; //FIXME SKIP type |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4464 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
|
4465 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
|
4466 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
|
4467 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
|
4468 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
|
4469 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4470 h->prev_mb_skiped= 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4471 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4472 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
|
4473 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4474 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4475 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4476 h->prev_mb_skiped = 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4477 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4478 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
|
4479 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
|
4480 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
|
4481 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4482 |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4483 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
|
4484 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
|
4485 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
|
4486 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
|
4487 }else{ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4488 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
|
4489 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
|
4490 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4491 } 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
|
4492 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
|
4493 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
|
4494 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
|
4495 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4496 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
|
4497 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
|
4498 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4499 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4500 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
|
4501 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
|
4502 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
|
4503 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
|
4504 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
|
4505 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
|
4506 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4507 #if 0 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4508 if(h->mb_field_decoding_flag) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4509 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
|
4510 #endif |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4511 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4512 s->current_picture.mb_type[mb_xy]= mb_type; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4513 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
|
4514 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4515 if(IS_INTRA_PCM(mb_type)) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4516 /* TODO */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4517 h->cbp_table[mb_xy] = 0xf +4*2; |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4518 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
|
4519 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
|
4520 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
|
4521 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4522 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4523 fill_caches(h, mb_type); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4524 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4525 if( IS_INTRA( mb_type ) ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4526 if( IS_INTRA4x4( mb_type ) ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4527 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
|
4528 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
|
4529 int pred = pred_intra_mode( h, i ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4530 h->intra4x4_pred_mode_cache[ scan8[i] ] = decode_cabac_mb_intra4x4_pred_mode( h, pred ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4531 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4532 //av_log( s->avctx, AV_LOG_ERROR, "i4x4 pred=%d mode=%d\n", pred, h->intra4x4_pred_mode_cache[ scan8[i] ] ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4533 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4534 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
|
4535 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
|
4536 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4537 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
|
4538 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
|
4539 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4540 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
|
4541 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
|
4542 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4543 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
|
4544 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
|
4545 } 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
|
4546 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
|
4547 |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4548 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
|
4549 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
|
4550 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
|
4551 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
|
4552 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
|
4553 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4554 } else { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4555 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
|
4556 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
|
4557 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
|
4558 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
|
4559 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4560 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4561 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4562 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
|
4563 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
|
4564 for( i = 0; i < 4; i++ ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4565 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
|
4566 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
|
4567 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
|
4568 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4569 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
|
4570 } else { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4571 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
|
4572 } |
| 2110 | 4573 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
|
4574 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
|
4575 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4576 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4577 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4578 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4579 for(list=0; list<2; list++){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4580 for(i=0; i<4; i++){ |
| 2110 | 4581 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
|
4582 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4583 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
|
4584 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
|
4585 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
|
4586 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
|
4587 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
|
4588 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
|
4589 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
|
4590 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
|
4591 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
|
4592 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
|
4593 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4594 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
|
4595 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
|
4596 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
|
4597 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4598 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
|
4599 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
|
4600 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
|
4601 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
|
4602 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
|
4603 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4604 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
|
4605 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
|
4606 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
|
4607 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
|
4608 }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
|
4609 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
|
4610 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
|
4611 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4612 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
|
4613 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
|
4614 }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
|
4615 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
|
4616 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
|
4617 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4618 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
|
4619 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
|
4620 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4621 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
|
4622 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
|
4623 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
|
4624 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4625 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
|
4626 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
|
4627 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4628 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4629 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4630 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
|
4631 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
|
4632 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
|
4633 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
|
4634 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4635 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4636 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4637 } else if( !IS_DIRECT(mb_type) ) { |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4638 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
|
4639 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
|
4640 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
|
4641 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
|
4642 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
|
4643 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
|
4644 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
|
4645 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4646 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4647 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4648 for(list=0; list<2; list++){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4649 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
|
4650 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
|
4651 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4652 mx = mpx + decode_cabac_mb_mvd( h, list, 0, 0 ); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4653 my = mpy + decode_cabac_mb_mvd( h, list, 0, 1 ); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4654 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
|
4655 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4656 fill_rectangle(h->mvd_cache[list][ scan8[0] ], 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
|
4657 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4658 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4659 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4660 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4661 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
|
4662 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
|
4663 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
|
4664 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
|
4665 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
|
4666 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
|
4667 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, ref, 1); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4668 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4669 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4670 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4671 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4672 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
|
4673 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
|
4674 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
|
4675 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
|
4676 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
|
4677 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
|
4678 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
|
4679 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4680 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
|
4681 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4682 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4683 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4684 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4685 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4686 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
|
4687 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
|
4688 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
|
4689 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
|
4690 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
|
4691 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
|
4692 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, ref, 1); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4693 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4694 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4695 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4696 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4697 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
|
4698 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
|
4699 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
|
4700 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
|
4701 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
|
4702 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
|
4703 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4704 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
|
4705 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
|
4706 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4707 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4708 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4709 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4710 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4711 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4712 |
|
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
|
4713 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
|
4714 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
|
4715 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
|
4716 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4717 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4718 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
|
4719 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
|
4720 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
|
4721 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4722 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4723 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
|
4724 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4725 if( cbp || IS_INTRA16x16( mb_type ) ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4726 const uint8_t *scan, *dc_scan; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4727 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
|
4728 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4729 if(IS_INTERLACED(mb_type)){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4730 scan= field_scan; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4731 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
|
4732 }else{ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4733 scan= zigzag_scan; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4734 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
|
4735 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4736 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4737 h->last_qscale_diff = dqp = decode_cabac_mb_dqp( h ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4738 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
|
4739 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
|
4740 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
|
4741 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
|
4742 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4743 h->chroma_qp = get_chroma_qp(h, s->qscale); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4744 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4745 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
|
4746 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
|
4747 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4748 if( decode_cabac_residual( h, h->mb, 0, 0, dc_scan, s->qscale, 16) < 0) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4749 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
|
4750 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
|
4751 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
|
4752 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4753 if( decode_cabac_residual(h, h->mb + 16*i, 1, i, scan + 1, s->qscale, 15) < 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4754 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
|
4755 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4756 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4757 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
|
4758 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4759 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4760 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
|
4761 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
|
4762 if( cbp & (1<<i8x8) ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4763 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
|
4764 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
|
4765 //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4766 if( decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, s->qscale, 16) < 0 ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4767 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
|
4768 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4769 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4770 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
|
4771 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
|
4772 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4773 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4774 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4775 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4776 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
|
4777 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
|
4778 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
|
4779 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4780 if( decode_cabac_residual(h, h->mb + 256 + 16*4*c, 3, c, chroma_dc_scan, h->chroma_qp, 4) < 0) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4781 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
|
4782 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4783 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4784 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4785 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
|
4786 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
|
4787 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
|
4788 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
|
4789 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
|
4790 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4791 if( decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, h->chroma_qp, 15) < 0) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4792 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
|
4793 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4794 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4795 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4796 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
|
4797 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
|
4798 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
|
4799 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4800 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4801 memset( &h->non_zero_count_cache[8], 0, 8*5 ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4802 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4803 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4804 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
|
4805 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
|
4806 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4807 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
|
4808 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4809 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4810 |
|
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
|
4811 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
|
4812 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
|
4813 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
|
4814 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
|
4815 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
|
4816 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4817 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
|
4818 if( bS[i] == 0 ) { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4819 pix += 4 * stride; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4820 continue; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4821 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4822 |
| 1898 | 4823 if( bS[i] < 4 ) { |
| 4824 const int tc0 = tc0_table[index_a][bS[i] - 1]; | |
| 4825 /* 4px edge length */ | |
| 4826 for( d = 0; d < 4; d++ ) { | |
| 4827 const int p0 = pix[-1]; | |
| 4828 const int p1 = pix[-2]; | |
| 4829 const int p2 = pix[-3]; | |
| 4830 const int q0 = pix[0]; | |
| 4831 const int q1 = pix[1]; | |
| 4832 const int q2 = pix[2]; | |
| 4833 | |
| 4834 if( ABS( p0 - q0 ) < alpha && | |
| 4835 ABS( p1 - p0 ) < beta && | |
| 4836 ABS( q1 - q0 ) < beta ) { | |
| 4837 int tc = tc0; | |
| 4838 int i_delta; | |
| 4839 | |
| 4840 if( ABS( p2 - p0 ) < beta ) { | |
| 4841 pix[-2] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); | |
| 4842 tc++; | |
| 4843 } | |
| 4844 if( ABS( q2 - q0 ) < beta ) { | |
| 4845 pix[1] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); | |
| 4846 tc++; | |
| 4847 } | |
| 4848 | |
| 4849 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
| 4850 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ | |
| 4851 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4852 } |
| 1898 | 4853 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
|
4854 } |
| 1898 | 4855 }else{ |
| 4856 /* 4px edge length */ | |
| 4857 for( d = 0; d < 4; d++ ) { | |
| 4858 const int p0 = pix[-1]; | |
| 4859 const int p1 = pix[-2]; | |
| 4860 const int p2 = pix[-3]; | |
| 4861 | |
| 4862 const int q0 = pix[0]; | |
| 4863 const int q1 = pix[1]; | |
| 4864 const int q2 = pix[2]; | |
| 4865 | |
| 4866 if( ABS( p0 - q0 ) < alpha && | |
| 4867 ABS( p1 - p0 ) < beta && | |
| 4868 ABS( q1 - q0 ) < beta ) { | |
| 4869 | |
| 4870 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
| 4871 if( ABS( p2 - p0 ) < beta) | |
| 4872 { | |
| 4873 const int p3 = pix[-4]; | |
| 4874 /* p0', p1', p2' */ | |
| 4875 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
| 4876 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
| 4877 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
| 4878 } else { | |
| 4879 /* p0' */ | |
| 4880 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 4881 } | |
| 4882 if( ABS( q2 - q0 ) < beta) | |
| 4883 { | |
| 4884 const int q3 = pix[3]; | |
| 4885 /* q0', q1', q2' */ | |
| 4886 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
| 4887 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
| 4888 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
| 4889 } else { | |
| 4890 /* q0' */ | |
| 4891 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 4892 } | |
| 4893 }else{ | |
| 4894 /* p0', q0' */ | |
| 4895 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 4896 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 4897 } | |
|
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
|
4898 } |
| 1898 | 4899 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
|
4900 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4901 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4902 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4903 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4904 static void filter_mb_edgecv( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4905 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
|
4906 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
|
4907 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
|
4908 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
|
4909 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4910 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
|
4911 if( bS[i] == 0 ) { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4912 pix += 2 * stride; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4913 continue; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4914 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4915 |
| 1898 | 4916 if( bS[i] < 4 ) { |
| 4917 const int tc = tc0_table[index_a][bS[i] - 1] + 1; | |
| 4918 /* 2px edge length (because we use same bS than the one for luma) */ | |
| 4919 for( d = 0; d < 2; d++ ){ | |
| 4920 const int p0 = pix[-1]; | |
| 4921 const int p1 = pix[-2]; | |
| 4922 const int q0 = pix[0]; | |
| 4923 const int q1 = pix[1]; | |
| 4924 | |
| 4925 if( ABS( p0 - q0 ) < alpha && | |
| 4926 ABS( p1 - p0 ) < beta && | |
| 4927 ABS( q1 - q0 ) < beta ) { | |
| 4928 const int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
| 4929 | |
| 4930 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ | |
| 4931 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
| 4932 } | |
|
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
|
4933 pix += stride; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4934 } |
| 1898 | 4935 }else{ |
| 4936 /* 2px edge length (because we use same bS than the one for luma) */ | |
| 4937 for( d = 0; d < 2; d++ ){ | |
| 4938 const int p0 = pix[-1]; | |
| 4939 const int p1 = pix[-2]; | |
| 4940 const int q0 = pix[0]; | |
| 4941 const int q1 = pix[1]; | |
| 4942 | |
| 4943 if( ABS( p0 - q0 ) < alpha && | |
| 4944 ABS( p1 - p0 ) < beta && | |
| 4945 ABS( q1 - q0 ) < beta ) { | |
| 4946 | |
| 4947 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */ | |
| 4948 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ | |
| 4949 } | |
| 4950 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
|
4951 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4952 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4953 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4954 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4955 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4956 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
|
4957 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
|
4958 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
|
4959 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
|
4960 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
|
4961 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
|
4962 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4963 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
|
4964 if( bS[i] == 0 ) { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4965 pix += 4; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4966 continue; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4967 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4968 |
| 1898 | 4969 if( bS[i] < 4 ) { |
| 4970 const int tc0 = tc0_table[index_a][bS[i] - 1]; | |
| 4971 /* 4px edge length */ | |
| 4972 for( d = 0; d < 4; d++ ) { | |
| 4973 const int p0 = pix[-1*pix_next]; | |
| 4974 const int p1 = pix[-2*pix_next]; | |
| 4975 const int p2 = pix[-3*pix_next]; | |
| 4976 const int q0 = pix[0]; | |
| 4977 const int q1 = pix[1*pix_next]; | |
| 4978 const int q2 = pix[2*pix_next]; | |
| 4979 | |
| 4980 if( ABS( p0 - q0 ) < alpha && | |
| 4981 ABS( p1 - p0 ) < beta && | |
| 4982 ABS( q1 - q0 ) < beta ) { | |
| 4983 | |
| 4984 int tc = tc0; | |
| 4985 int i_delta; | |
| 4986 | |
| 4987 if( ABS( p2 - p0 ) < beta ) { | |
| 4988 pix[-2*pix_next] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); | |
| 4989 tc++; | |
| 4990 } | |
| 4991 if( ABS( q2 - q0 ) < beta ) { | |
| 4992 pix[pix_next] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); | |
| 4993 tc++; | |
| 4994 } | |
| 4995 | |
| 4996 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
| 4997 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */ | |
| 4998 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
4999 } |
| 1898 | 5000 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
|
5001 } |
| 1898 | 5002 }else{ |
| 5003 /* 4px edge length */ | |
| 5004 for( d = 0; d < 4; d++ ) { | |
| 5005 const int p0 = pix[-1*pix_next]; | |
| 5006 const int p1 = pix[-2*pix_next]; | |
| 5007 const int p2 = pix[-3*pix_next]; | |
| 5008 const int q0 = pix[0]; | |
| 5009 const int q1 = pix[1*pix_next]; | |
| 5010 const int q2 = pix[2*pix_next]; | |
| 5011 | |
| 5012 if( ABS( p0 - q0 ) < alpha && | |
| 5013 ABS( p1 - p0 ) < beta && | |
| 5014 ABS( q1 - q0 ) < beta ) { | |
| 5015 | |
| 5016 const int p3 = pix[-4*pix_next]; | |
| 5017 const int q3 = pix[ 3*pix_next]; | |
| 5018 | |
| 5019 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
| 5020 if( ABS( p2 - p0 ) < beta) { | |
| 5021 /* p0', p1', p2' */ | |
| 5022 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
| 5023 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
| 5024 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
| 5025 } else { | |
| 5026 /* p0' */ | |
| 5027 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 5028 } | |
| 5029 if( ABS( q2 - q0 ) < beta) { | |
| 5030 /* q0', q1', q2' */ | |
| 5031 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
| 5032 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
| 5033 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
| 5034 } else { | |
| 5035 /* q0' */ | |
| 5036 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 5037 } | |
| 5038 }else{ | |
| 5039 /* p0', q0' */ | |
| 5040 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 5041 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 5042 } | |
|
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
|
5043 } |
| 1898 | 5044 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
|
5045 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5046 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5047 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5048 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5049 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5050 static void filter_mb_edgech( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5051 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
|
5052 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
|
5053 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
|
5054 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
|
5055 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
|
5056 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5057 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
|
5058 { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5059 if( bS[i] == 0 ) { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5060 pix += 2; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5061 continue; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5062 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5063 |
| 1898 | 5064 if( bS[i] < 4 ) { |
| 5065 int tc = tc0_table[index_a][bS[i] - 1] + 1; | |
| 5066 /* 2px edge length (see deblocking_filter_edgecv) */ | |
| 5067 for( d = 0; d < 2; d++ ) { | |
| 5068 const int p0 = pix[-1*pix_next]; | |
| 5069 const int p1 = pix[-2*pix_next]; | |
| 5070 const int q0 = pix[0]; | |
| 5071 const int q1 = pix[1*pix_next]; | |
| 5072 | |
| 5073 if( ABS( p0 - q0 ) < alpha && | |
| 5074 ABS( p1 - p0 ) < beta && | |
| 5075 ABS( q1 - q0 ) < beta ) { | |
| 5076 | |
| 5077 int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
| 5078 | |
| 5079 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */ | |
| 5080 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
| 5081 } | |
|
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
|
5082 pix++; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5083 } |
| 1898 | 5084 }else{ |
| 5085 /* 2px edge length (see deblocking_filter_edgecv) */ | |
| 5086 for( d = 0; d < 2; d++ ) { | |
| 5087 const int p0 = pix[-1*pix_next]; | |
| 5088 const int p1 = pix[-2*pix_next]; | |
| 5089 const int q0 = pix[0]; | |
| 5090 const int q1 = pix[1*pix_next]; | |
| 5091 | |
| 5092 if( ABS( p0 - q0 ) < alpha && | |
| 5093 ABS( p1 - p0 ) < beta && | |
| 5094 ABS( q1 - q0 ) < beta ) { | |
| 5095 | |
| 5096 pix[-pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */ | |
| 5097 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ | |
| 5098 } | |
| 5099 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
|
5100 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5101 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5102 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5103 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5104 |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5105 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr) { |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5106 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
|
5107 const int mb_xy= mb_x + mb_y*s->mb_stride; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5108 int linesize, uvlinesize; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5109 int dir; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5110 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5111 /* FIXME Implement deblocking filter for field MB */ |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5112 if( h->sps.mb_aff ) { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5113 return; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5114 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5115 linesize = s->linesize; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5116 uvlinesize = s->uvlinesize; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5117 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5118 /* 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
|
5119 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
|
5120 { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5121 int start = 0; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5122 int edge; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5123 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5124 /* test picture boundary */ |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5125 if( ( dir == 0 && mb_x == 0 ) || ( dir == 1 && mb_y == 0 ) ) { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5126 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
|
5127 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5128 /* FIXME test slice boundary */ |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5129 if( h->deblocking_filter == 2 ) { |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5130 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5131 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5132 /* Calculate bS */ |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5133 for( edge = start; edge < 4; edge++ ) { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5134 /* mbn_xy: neighbour macroblock (how that works for field ?) */ |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5135 int mbn_xy = edge > 0 ? mb_xy : ( dir == 0 ? mb_xy -1 : mb_xy - s->mb_stride ); |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5136 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
|
5137 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
|
5138 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5139 if( IS_INTRA( s->current_picture.mb_type[mb_xy] ) || |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5140 IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5141 bS[0] = bS[1] = bS[2] = bS[3] = ( edge == 0 ? 4 : 3 ); |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5142 } 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
|
5143 int i; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5144 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
|
5145 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
|
5146 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
|
5147 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
|
5148 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
|
5149 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5150 if( h->non_zero_count_cache[b_idx] != 0 || |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5151 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
|
5152 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
|
5153 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5154 else if( h->slice_type == P_TYPE ) { |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5155 if( h->ref_cache[0][b_idx] != h->ref_cache[0][bn_idx] || |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5156 ABS( h->mv_cache[0][b_idx][0] - h->mv_cache[0][bn_idx][0] ) >= 4 || |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5157 ABS( h->mv_cache[0][b_idx][1] - h->mv_cache[0][bn_idx][1] ) >= 4 ) |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5158 bS[i] = 1; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5159 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
|
5160 bS[i] = 0; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5161 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5162 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
|
5163 /* FIXME Add support for B frame */ |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5164 return; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5165 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5166 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5167 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5168 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
|
5169 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
|
5170 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5171 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5172 /* Filter edge */ |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5173 qp = ( s->qscale + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5174 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
|
5175 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp ); |
| 1898 | 5176 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
|
5177 int chroma_qp = ( h->chroma_qp + |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5178 get_chroma_qp( h, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5179 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
|
5180 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
|
5181 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5182 } 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
|
5183 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp ); |
| 1898 | 5184 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
|
5185 int chroma_qp = ( h->chroma_qp + |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5186 get_chroma_qp( h, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5187 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
|
5188 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
|
5189 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5190 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5191 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5192 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5193 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5194 |
| 1168 | 5195 static int decode_slice(H264Context *h){ |
| 5196 MpegEncContext * const s = &h->s; | |
| 5197 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; | |
| 5198 | |
| 5199 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
|
5200 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5201 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
|
5202 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
|
5203 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5204 /* realign */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5205 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
|
5206 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5207 /* 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
|
5208 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
|
5209 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
|
5210 s->gb.buffer + get_bits_count(&s->gb)/8, |
| 2116 | 5211 ( 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
|
5212 /* calculate pre-state */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5213 for( i= 0; i < 399; i++ ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5214 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
|
5215 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
|
5216 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
|
5217 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5218 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
|
5219 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5220 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
|
5221 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
|
5222 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5223 h->cabac_state[i] = 2 * ( pre - 64 ) + 1; |
| 1168 | 5224 } |
| 5225 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5226 for(;;){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5227 int ret = decode_mb_cabac(h); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5228 int eos = get_cabac_terminate( &h->cabac ); /* End of Slice flag */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5229 |
| 2163 | 5230 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
|
5231 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5232 /* XXX: useless as decode_mb_cabac it doesn't support that ... */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5233 if( ret >= 0 && h->sps.mb_aff ) { //FIXME optimal? or let mb_decode decode 16x32 ? |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5234 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
|
5235 |
| 2163 | 5236 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
|
5237 eos = get_cabac_terminate( &h->cabac ); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5238 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5239 hl_decode_mb(h); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5240 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
|
5241 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5242 |
| 2116 | 5243 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 1) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5244 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
|
5245 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
|
5246 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
|
5247 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5248 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5249 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
|
5250 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
|
5251 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5252 if( ++s->mb_y >= s->mb_height ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5253 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
|
5254 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5255 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5256 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5257 if( eos || s->mb_y >= s->mb_height ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5258 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
|
5259 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
|
5260 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5261 #if 0 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5262 /* TODO test over-reading in cabac code */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5263 else if( read too much in h->cabac ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5264 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
|
5265 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
|
5266 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5267 #endif |
| 1168 | 5268 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5269 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5270 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5271 for(;;){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5272 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
|
5273 |
| 2163 | 5274 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
|
5275 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5276 if(ret>=0 && h->sps.mb_aff){ //FIXME optimal? or let mb_decode decode 16x32 ? |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5277 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
|
5278 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
|
5279 |
| 2163 | 5280 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
|
5281 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
|
5282 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5283 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5284 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
|
5285 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
|
5286 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
|
5287 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5288 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
|
5289 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5290 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5291 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
|
5292 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
|
5293 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5294 if(++s->mb_y >= s->mb_height){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5295 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
|
5296 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5297 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
|
5298 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
|
5299 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5300 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
|
5301 }else{ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5302 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
|
5303 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5304 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
|
5305 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5306 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5307 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5308 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5309 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5310 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){ |
| 1168 | 5311 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); |
| 5312 | |
| 5313 return 0; | |
| 5314 }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
|
5315 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 | 5316 |
| 5317 return -1; | |
| 5318 } | |
| 5319 } | |
| 5320 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5321 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5322 |
| 1168 | 5323 #if 0 |
| 5324 for(;s->mb_y < s->mb_height; s->mb_y++){ | |
| 5325 for(;s->mb_x < s->mb_width; s->mb_x++){ | |
| 5326 int ret= decode_mb(h); | |
| 5327 | |
| 5328 hl_decode_mb(h); | |
| 5329 | |
| 5330 if(ret<0){ | |
| 5331 fprintf(stderr, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); | |
| 5332 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); | |
| 5333 | |
| 5334 return -1; | |
| 5335 } | |
| 5336 | |
| 5337 if(++s->mb_x >= s->mb_width){ | |
| 5338 s->mb_x=0; | |
| 5339 if(++s->mb_y >= s->mb_height){ | |
| 5340 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
| 5341 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); | |
| 5342 | |
| 5343 return 0; | |
| 5344 }else{ | |
| 5345 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); | |
| 5346 | |
| 5347 return -1; | |
| 5348 } | |
| 5349 } | |
| 5350 } | |
| 5351 | |
| 5352 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){ | |
| 5353 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
| 5354 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); | |
| 5355 | |
| 5356 return 0; | |
| 5357 }else{ | |
| 5358 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); | |
| 5359 | |
| 5360 return -1; | |
| 5361 } | |
| 5362 } | |
| 5363 } | |
| 5364 s->mb_x=0; | |
| 5365 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
| 5366 } | |
| 5367 #endif | |
| 5368 return -1; //not reached | |
| 5369 } | |
| 5370 | |
| 5371 static inline int decode_vui_parameters(H264Context *h, SPS *sps){ | |
| 5372 MpegEncContext * const s = &h->s; | |
| 5373 int aspect_ratio_info_present_flag, aspect_ratio_idc; | |
| 5374 | |
| 5375 aspect_ratio_info_present_flag= get_bits1(&s->gb); | |
| 5376 | |
| 5377 if( aspect_ratio_info_present_flag ) { | |
| 5378 aspect_ratio_idc= get_bits(&s->gb, 8); | |
| 5379 if( aspect_ratio_idc == EXTENDED_SAR ) { | |
| 1548 | 5380 sps->sar.num= get_bits(&s->gb, 16); |
| 5381 sps->sar.den= get_bits(&s->gb, 16); | |
| 1168 | 5382 }else if(aspect_ratio_idc < 16){ |
| 1548 | 5383 sps->sar= pixel_aspect[aspect_ratio_idc]; |
| 1168 | 5384 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5385 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n"); |
| 1168 | 5386 return -1; |
| 5387 } | |
| 5388 }else{ | |
| 1548 | 5389 sps->sar.num= |
| 5390 sps->sar.den= 0; | |
| 1168 | 5391 } |
| 5392 // 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 (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5393 |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5394 if(get_bits1(&s->gb)){ /* overscan_info_present_flag */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5395 get_bits1(&s->gb); /* overscan_appropriate_flag */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5396 } |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5397 |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5398 if(get_bits1(&s->gb)){ /* video_signal_type_present_flag */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5399 get_bits(&s->gb, 3); /* video_format */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5400 get_bits1(&s->gb); /* video_full_range_flag */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5401 if(get_bits1(&s->gb)){ /* colour_description_present_flag */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5402 get_bits(&s->gb, 8); /* colour_primaries */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5403 get_bits(&s->gb, 8); /* transfer_characteristics */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5404 get_bits(&s->gb, 8); /* matrix_coefficients */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5405 } |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5406 } |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5407 |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5408 if(get_bits1(&s->gb)){ /* chroma_location_info_present_flag */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5409 get_ue_golomb(&s->gb); /* chroma_sample_location_type_top_field */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5410 get_ue_golomb(&s->gb); /* chroma_sample_location_type_bottom_field */ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5411 } |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5412 |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5413 sps->timing_info_present_flag = get_bits1(&s->gb); |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5414 if(sps->timing_info_present_flag){ |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5415 sps->num_units_in_tick = get_bits_long(&s->gb, 32); |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5416 sps->time_scale = get_bits_long(&s->gb, 32); |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5417 sps->fixed_frame_rate_flag = get_bits1(&s->gb); |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5418 } |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
5419 |
| 1168 | 5420 #if 0 |
| 5421 | nal_hrd_parameters_present_flag |0 |u(1) | | |
| 5422 | if( nal_hrd_parameters_present_flag = = 1) | | | | |
| 5423 | hrd_parameters( ) | | | | |
| 5424 | vcl_hrd_parameters_present_flag |0 |u(1) | | |
| 5425 | if( vcl_hrd_parameters_present_flag = = 1) | | | | |
| 5426 | hrd_parameters( ) | | | | |
| 5427 | if( ( nal_hrd_parameters_present_flag = = 1 | || | | | |
| 5428 | | | | | |
| 5429 |( vcl_hrd_parameters_present_flag = = 1 ) ) | | | | |
| 5430 | low_delay_hrd_flag |0 |u(1) | | |
| 5431 | bitstream_restriction_flag |0 |u(1) | | |
| 5432 | if( bitstream_restriction_flag ) { |0 |u(1) | | |
| 5433 | motion_vectors_over_pic_boundaries_flag |0 |u(1) | | |
| 5434 | max_bytes_per_pic_denom |0 |ue(v) | | |
| 5435 | max_bits_per_mb_denom |0 |ue(v) | | |
| 5436 | log2_max_mv_length_horizontal |0 |ue(v) | | |
| 5437 | log2_max_mv_length_vertical |0 |ue(v) | | |
| 5438 | num_reorder_frames |0 |ue(v) | | |
| 5439 | max_dec_frame_buffering |0 |ue(v) | | |
| 5440 | } | | | | |
| 5441 |} | | | | |
| 5442 #endif | |
| 5443 return 0; | |
| 5444 } | |
| 5445 | |
| 5446 static inline int decode_seq_parameter_set(H264Context *h){ | |
| 5447 MpegEncContext * const s = &h->s; | |
| 1371 | 5448 int profile_idc, level_idc; |
| 1168 | 5449 int sps_id, i; |
| 5450 SPS *sps; | |
| 5451 | |
| 5452 profile_idc= get_bits(&s->gb, 8); | |
| 1371 | 5453 get_bits1(&s->gb); //constraint_set0_flag |
| 5454 get_bits1(&s->gb); //constraint_set1_flag | |
| 5455 get_bits1(&s->gb); //constraint_set2_flag | |
| 5456 get_bits(&s->gb, 5); // reserved | |
| 1168 | 5457 level_idc= get_bits(&s->gb, 8); |
| 5458 sps_id= get_ue_golomb(&s->gb); | |
| 5459 | |
| 5460 sps= &h->sps_buffer[ sps_id ]; | |
| 5461 sps->profile_idc= profile_idc; | |
| 5462 sps->level_idc= level_idc; | |
| 5463 | |
| 5464 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4; | |
| 5465 sps->poc_type= get_ue_golomb(&s->gb); | |
| 5466 | |
| 5467 if(sps->poc_type == 0){ //FIXME #define | |
| 5468 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4; | |
| 5469 } else if(sps->poc_type == 1){//FIXME #define | |
| 5470 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb); | |
| 5471 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb); | |
| 5472 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb); | |
| 5473 sps->poc_cycle_length= get_ue_golomb(&s->gb); | |
| 5474 | |
| 5475 for(i=0; i<sps->poc_cycle_length; i++) | |
| 5476 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb); | |
| 5477 } | |
| 5478 if(sps->poc_type > 2){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5479 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type); |
| 1168 | 5480 return -1; |
| 5481 } | |
| 5482 | |
| 5483 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
|
5484 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
|
5485 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
|
5486 } |
| 1371 | 5487 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb); |
| 1168 | 5488 sps->mb_width= get_ue_golomb(&s->gb) + 1; |
| 5489 sps->mb_height= get_ue_golomb(&s->gb) + 1; | |
| 5490 sps->frame_mbs_only_flag= get_bits1(&s->gb); | |
| 5491 if(!sps->frame_mbs_only_flag) | |
| 5492 sps->mb_aff= get_bits1(&s->gb); | |
| 5493 else | |
| 5494 sps->mb_aff= 0; | |
| 5495 | |
| 5496 sps->direct_8x8_inference_flag= get_bits1(&s->gb); | |
| 5497 | |
| 1371 | 5498 sps->crop= get_bits1(&s->gb); |
| 5499 if(sps->crop){ | |
| 5500 sps->crop_left = get_ue_golomb(&s->gb); | |
| 5501 sps->crop_right = get_ue_golomb(&s->gb); | |
| 5502 sps->crop_top = get_ue_golomb(&s->gb); | |
| 5503 sps->crop_bottom= get_ue_golomb(&s->gb); | |
| 5504 if(sps->crop_left || sps->crop_top){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5505 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completly supported, this could look slightly wrong ...\n"); |
| 1371 | 5506 } |
| 5507 }else{ | |
| 5508 sps->crop_left = | |
| 5509 sps->crop_right = | |
| 5510 sps->crop_top = | |
| 5511 sps->crop_bottom= 0; | |
| 5512 } | |
| 5513 | |
| 1168 | 5514 sps->vui_parameters_present_flag= get_bits1(&s->gb); |
| 5515 if( sps->vui_parameters_present_flag ) | |
| 5516 decode_vui_parameters(h, sps); | |
| 5517 | |
| 5518 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5519 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 | 5520 sps_id, sps->profile_idc, sps->level_idc, |
| 5521 sps->poc_type, | |
| 5522 sps->ref_frame_count, | |
| 5523 sps->mb_width, sps->mb_height, | |
| 5524 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"), | |
| 5525 sps->direct_8x8_inference_flag ? "8B8" : "", | |
| 1371 | 5526 sps->crop_left, sps->crop_right, |
| 5527 sps->crop_top, sps->crop_bottom, | |
| 1168 | 5528 sps->vui_parameters_present_flag ? "VUI" : "" |
| 5529 ); | |
| 5530 } | |
| 5531 return 0; | |
| 5532 } | |
| 5533 | |
| 5534 static inline int decode_picture_parameter_set(H264Context *h){ | |
| 5535 MpegEncContext * const s = &h->s; | |
| 5536 int pps_id= get_ue_golomb(&s->gb); | |
| 5537 PPS *pps= &h->pps_buffer[pps_id]; | |
| 5538 | |
| 5539 pps->sps_id= get_ue_golomb(&s->gb); | |
| 5540 pps->cabac= get_bits1(&s->gb); | |
| 5541 pps->pic_order_present= get_bits1(&s->gb); | |
| 5542 pps->slice_group_count= get_ue_golomb(&s->gb) + 1; | |
| 5543 if(pps->slice_group_count > 1 ){ | |
| 5544 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
|
5545 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n"); |
| 1168 | 5546 switch(pps->mb_slice_group_map_type){ |
| 5547 case 0: | |
| 5548 #if 0 | |
| 5549 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | | | |
| 5550 | run_length[ i ] |1 |ue(v) | | |
| 5551 #endif | |
| 5552 break; | |
| 5553 case 2: | |
| 5554 #if 0 | |
| 5555 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | | | |
| 5556 |{ | | | | |
| 5557 | top_left_mb[ i ] |1 |ue(v) | | |
| 5558 | bottom_right_mb[ i ] |1 |ue(v) | | |
| 5559 | } | | | | |
| 5560 #endif | |
| 5561 break; | |
| 5562 case 3: | |
| 5563 case 4: | |
| 5564 case 5: | |
| 5565 #if 0 | |
| 5566 | slice_group_change_direction_flag |1 |u(1) | | |
| 5567 | slice_group_change_rate_minus1 |1 |ue(v) | | |
| 5568 #endif | |
| 5569 break; | |
| 5570 case 6: | |
| 5571 #if 0 | |
| 5572 | slice_group_id_cnt_minus1 |1 |ue(v) | | |
| 5573 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | | | |
| 5574 |) | | | | |
| 5575 | slice_group_id[ i ] |1 |u(v) | | |
| 5576 #endif | |
| 1214 | 5577 break; |
| 1168 | 5578 } |
| 5579 } | |
| 5580 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
| 5581 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
| 5582 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
|
5583 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n"); |
| 1168 | 5584 return -1; |
| 5585 } | |
| 5586 | |
| 5587 pps->weighted_pred= get_bits1(&s->gb); | |
| 5588 pps->weighted_bipred_idc= get_bits(&s->gb, 2); | |
| 5589 pps->init_qp= get_se_golomb(&s->gb) + 26; | |
| 5590 pps->init_qs= get_se_golomb(&s->gb) + 26; | |
| 5591 pps->chroma_qp_index_offset= get_se_golomb(&s->gb); | |
| 5592 pps->deblocking_filter_parameters_present= get_bits1(&s->gb); | |
| 5593 pps->constrained_intra_pred= get_bits1(&s->gb); | |
| 5594 pps->redundant_pic_cnt_present = get_bits1(&s->gb); | |
| 5595 | |
| 5596 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5597 av_log(h->s.avctx, AV_LOG_DEBUG, "pps:%d sps:%d %s slice_groups:%d ref:%d/%d %s qp:%d/%d/%d %s %s %s\n", |
| 1168 | 5598 pps_id, pps->sps_id, |
| 5599 pps->cabac ? "CABAC" : "CAVLC", | |
| 5600 pps->slice_group_count, | |
| 5601 pps->ref_count[0], pps->ref_count[1], | |
| 5602 pps->weighted_pred ? "weighted" : "", | |
| 5603 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset, | |
| 5604 pps->deblocking_filter_parameters_present ? "LPAR" : "", | |
| 5605 pps->constrained_intra_pred ? "CONSTR" : "", | |
| 1371 | 5606 pps->redundant_pic_cnt_present ? "REDU" : "" |
| 1168 | 5607 ); |
| 5608 } | |
| 5609 | |
| 5610 return 0; | |
| 5611 } | |
| 5612 | |
| 5613 /** | |
| 5614 * finds the end of the current frame in the bitstream. | |
| 5615 * @return the position of the first byte of the next frame, or -1 | |
| 5616 */ | |
| 1988 | 5617 static int find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){ |
| 1187 | 5618 int i; |
| 1168 | 5619 uint32_t state; |
| 5620 //printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]); | |
| 5621 // mb_addr= pc->mb_addr - 1; | |
| 5622 state= pc->state; | |
| 5623 //FIXME this will fail with slices | |
| 5624 for(i=0; i<buf_size; i++){ | |
| 5625 state= (state<<8) | buf[i]; | |
| 5626 if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){ | |
| 5627 if(pc->frame_start_found){ | |
| 5628 pc->state=-1; | |
| 5629 pc->frame_start_found= 0; | |
| 5630 return i-3; | |
| 5631 } | |
| 5632 pc->frame_start_found= 1; | |
| 5633 } | |
| 5634 } | |
| 5635 | |
| 5636 pc->state= state; | |
| 1219 | 5637 return END_NOT_FOUND; |
| 1168 | 5638 } |
| 5639 | |
| 1988 | 5640 static int h264_parse(AVCodecParserContext *s, |
| 5641 AVCodecContext *avctx, | |
| 5642 uint8_t **poutbuf, int *poutbuf_size, | |
| 5643 const uint8_t *buf, int buf_size) | |
| 5644 { | |
| 5645 ParseContext *pc = s->priv_data; | |
| 5646 int next; | |
| 5647 | |
| 5648 next= find_frame_end(pc, buf, buf_size); | |
| 5649 | |
| 5650 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { | |
| 5651 *poutbuf = NULL; | |
| 5652 *poutbuf_size = 0; | |
| 5653 return buf_size; | |
| 5654 } | |
| 5655 | |
| 5656 *poutbuf = (uint8_t *)buf; | |
| 5657 *poutbuf_size = buf_size; | |
| 5658 return next; | |
| 5659 } | |
| 5660 | |
| 1168 | 5661 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ |
| 5662 MpegEncContext * const s = &h->s; | |
| 5663 AVCodecContext * const avctx= s->avctx; | |
| 5664 int buf_index=0; | |
| 1322 | 5665 #if 0 |
| 1168 | 5666 int i; |
| 5667 for(i=0; i<32; i++){ | |
| 5668 printf("%X ", buf[i]); | |
| 5669 } | |
| 5670 #endif | |
| 5671 for(;;){ | |
| 5672 int consumed; | |
| 5673 int dst_length; | |
| 5674 int bit_length; | |
| 5675 uint8_t *ptr; | |
| 2227 | 5676 int i, nalsize = 0; |
| 1168 | 5677 |
| 2227 | 5678 if(h->is_avc) { |
| 5679 if(buf_index >= buf_size) break; | |
| 5680 nalsize = 0; | |
| 5681 for(i = 0; i < h->nal_length_size; i++) | |
| 5682 nalsize = (nalsize << 8) | buf[buf_index++]; | |
| 5683 } else { | |
| 1168 | 5684 // start code prefix search |
| 5685 for(; buf_index + 3 < buf_size; buf_index++){ | |
| 5686 // this should allways succeed in the first iteration | |
| 5687 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | |
| 5688 break; | |
| 5689 } | |
| 5690 | |
| 5691 if(buf_index+3 >= buf_size) break; | |
| 5692 | |
| 5693 buf_index+=3; | |
| 2227 | 5694 } |
| 1168 | 5695 |
| 5696 ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, buf_size - buf_index); | |
| 5697 if(ptr[dst_length - 1] == 0) dst_length--; | |
| 5698 bit_length= 8*dst_length - decode_rbsp_trailing(ptr + dst_length - 1); | |
| 5699 | |
| 5700 if(s->avctx->debug&FF_DEBUG_STARTCODE){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5701 av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d length %d\n", h->nal_unit_type, buf_index, dst_length); |
| 1168 | 5702 } |
| 5703 | |
| 2227 | 5704 if (h->is_avc && (nalsize != consumed)) |
| 5705 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); | |
| 5706 | |
| 1168 | 5707 buf_index += consumed; |
| 5708 | |
|
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
|
5709 if( s->hurry_up == 1 && h->nal_ref_idc == 0 ) |
| 1168 | 5710 continue; |
| 5711 | |
| 5712 switch(h->nal_unit_type){ | |
| 5713 case NAL_IDR_SLICE: | |
| 5714 idr(h); //FIXME ensure we dont loose some frames if there is reordering | |
| 5715 case NAL_SLICE: | |
| 5716 init_get_bits(&s->gb, ptr, bit_length); | |
| 5717 h->intra_gb_ptr= | |
| 5718 h->inter_gb_ptr= &s->gb; | |
| 5719 s->data_partitioning = 0; | |
| 5720 | |
| 5721 if(decode_slice_header(h) < 0) return -1; | |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
5722 if(h->redundant_pic_count==0 && s->hurry_up < 5 ) |
| 1168 | 5723 decode_slice(h); |
| 5724 break; | |
| 5725 case NAL_DPA: | |
| 5726 init_get_bits(&s->gb, ptr, bit_length); | |
| 5727 h->intra_gb_ptr= | |
| 5728 h->inter_gb_ptr= NULL; | |
| 5729 s->data_partitioning = 1; | |
| 5730 | |
| 5731 if(decode_slice_header(h) < 0) return -1; | |
| 5732 break; | |
| 5733 case NAL_DPB: | |
| 5734 init_get_bits(&h->intra_gb, ptr, bit_length); | |
| 5735 h->intra_gb_ptr= &h->intra_gb; | |
| 5736 break; | |
| 5737 case NAL_DPC: | |
| 5738 init_get_bits(&h->inter_gb, ptr, bit_length); | |
| 5739 h->inter_gb_ptr= &h->inter_gb; | |
| 1174 | 5740 |
|
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
|
5741 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning && s->hurry_up < 5 ) |
| 1168 | 5742 decode_slice(h); |
| 5743 break; | |
| 5744 case NAL_SEI: | |
| 5745 break; | |
| 5746 case NAL_SPS: | |
| 5747 init_get_bits(&s->gb, ptr, bit_length); | |
| 5748 decode_seq_parameter_set(h); | |
| 5749 | |
| 5750 if(s->flags& CODEC_FLAG_LOW_DELAY) | |
| 5751 s->low_delay=1; | |
| 5752 | |
| 5753 avctx->has_b_frames= !s->low_delay; | |
| 5754 break; | |
| 5755 case NAL_PPS: | |
| 5756 init_get_bits(&s->gb, ptr, bit_length); | |
| 5757 | |
| 5758 decode_picture_parameter_set(h); | |
| 5759 | |
| 5760 break; | |
| 5761 case NAL_PICTURE_DELIMITER: | |
| 5762 break; | |
| 5763 case NAL_FILTER_DATA: | |
| 5764 break; | |
| 2099 | 5765 default: |
| 5766 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type); | |
| 1168 | 5767 } |
| 5768 | |
| 5769 //FIXME move after where irt is set | |
| 5770 s->current_picture.pict_type= s->pict_type; | |
| 5771 s->current_picture.key_frame= s->pict_type == I_TYPE; | |
| 5772 } | |
| 5773 | |
| 1174 | 5774 if(!s->current_picture_ptr) return buf_index; //no frame |
| 5775 | |
| 1168 | 5776 h->prev_frame_num_offset= h->frame_num_offset; |
| 5777 h->prev_frame_num= h->frame_num; | |
| 5778 if(s->current_picture_ptr->reference){ | |
| 5779 h->prev_poc_msb= h->poc_msb; | |
| 5780 h->prev_poc_lsb= h->poc_lsb; | |
| 5781 } | |
| 5782 if(s->current_picture_ptr->reference) | |
| 5783 execute_ref_pic_marking(h, h->mmco, h->mmco_index); | |
| 5784 else | |
| 1169 | 5785 assert(h->mmco_index==0); |
| 1168 | 5786 |
| 5787 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
|
5788 |
| 1168 | 5789 MPV_frame_end(s); |
| 5790 | |
| 5791 return buf_index; | |
| 5792 } | |
| 5793 | |
| 5794 /** | |
| 5795 * retunrs the number of bytes consumed for building the current frame | |
| 5796 */ | |
| 5797 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){ | |
| 5798 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
| 5799 pos -= s->parse_context.last_index; | |
| 5800 if(pos<0) pos=0; // FIXME remove (uneeded?) | |
| 5801 | |
| 5802 return pos; | |
| 5803 }else{ | |
| 5804 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...) | |
| 5805 if(pos+10>buf_size) pos=buf_size; // oops ;) | |
| 5806 | |
| 5807 return pos; | |
| 5808 } | |
| 5809 } | |
| 5810 | |
| 5811 static int decode_frame(AVCodecContext *avctx, | |
| 5812 void *data, int *data_size, | |
| 5813 uint8_t *buf, int buf_size) | |
| 5814 { | |
| 5815 H264Context *h = avctx->priv_data; | |
| 5816 MpegEncContext *s = &h->s; | |
| 5817 AVFrame *pict = data; | |
| 5818 int buf_index; | |
| 5819 | |
| 5820 s->flags= avctx->flags; | |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1706
diff
changeset
|
5821 s->flags2= avctx->flags2; |
| 1168 | 5822 |
| 5823 /* no supplementary picture */ | |
| 5824 if (buf_size == 0) { | |
| 5825 return 0; | |
| 5826 } | |
| 5827 | |
| 5828 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
| 1988 | 5829 int next= find_frame_end(&s->parse_context, buf, buf_size); |
| 1168 | 5830 |
| 1988 | 5831 if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 ) |
| 1168 | 5832 return buf_size; |
| 5833 //printf("next:%d buf_size:%d last_index:%d\n", next, buf_size, s->parse_context.last_index); | |
| 5834 } | |
| 5835 | |
| 2227 | 5836 if(h->is_avc && !h->got_avcC) { |
| 5837 int i, cnt, nalsize; | |
| 5838 unsigned char *p = avctx->extradata; | |
| 5839 if(avctx->extradata_size < 7) { | |
| 5840 av_log(avctx, AV_LOG_ERROR, "avcC too short\n"); | |
| 5841 return -1; | |
| 5842 } | |
| 5843 if(*p != 1) { | |
| 5844 av_log(avctx, AV_LOG_ERROR, "Unknown avcC version %d\n", *p); | |
| 5845 return -1; | |
| 5846 } | |
| 5847 /* sps and pps in the avcC always have length coded with 2 bytes, | |
| 5848 so put a fake nal_length_size = 2 while parsing them */ | |
| 5849 h->nal_length_size = 2; | |
| 5850 // Decode sps from avcC | |
| 5851 cnt = *(p+5) & 0x1f; // Number of sps | |
| 5852 p += 6; | |
| 5853 for (i = 0; i < cnt; i++) { | |
| 5854 nalsize = BE_16(p) + 2; | |
| 5855 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
| 5856 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); | |
| 5857 return -1; | |
| 5858 } | |
| 5859 p += nalsize; | |
| 5860 } | |
| 5861 // Decode pps from avcC | |
| 5862 cnt = *(p++); // Number of pps | |
| 5863 for (i = 0; i < cnt; i++) { | |
| 5864 nalsize = BE_16(p) + 2; | |
| 5865 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
| 5866 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); | |
| 5867 return -1; | |
| 5868 } | |
| 5869 p += nalsize; | |
| 5870 } | |
| 5871 // Now store right nal length size, that will be use to parse all other nals | |
| 5872 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1; | |
| 5873 // Do not reparse avcC | |
| 5874 h->got_avcC = 1; | |
| 5875 } | |
| 5876 | |
| 5877 if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){ | |
| 1168 | 5878 if(0 < decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) ) |
| 5879 return -1; | |
| 5880 } | |
| 5881 | |
| 5882 buf_index=decode_nal_units(h, buf, buf_size); | |
| 5883 if(buf_index < 0) | |
| 5884 return -1; | |
| 5885 | |
| 5886 //FIXME do something with unavailable reference frames | |
| 5887 | |
| 5888 // if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_index, buf_size); | |
| 5889 #if 0 | |
| 5890 if(s->pict_type==B_TYPE || s->low_delay){ | |
| 5891 *pict= *(AVFrame*)&s->current_picture; | |
| 5892 } else { | |
| 5893 *pict= *(AVFrame*)&s->last_picture; | |
| 5894 } | |
| 5895 #endif | |
| 1174 | 5896 if(!s->current_picture_ptr){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
5897 av_log(h->s.avctx, AV_LOG_DEBUG, "error, NO frame\n"); |
| 1174 | 5898 return -1; |
| 5899 } | |
| 5900 | |
| 1168 | 5901 *pict= *(AVFrame*)&s->current_picture; //FIXME |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1698
diff
changeset
|
5902 ff_print_debug_info(s, pict); |
| 1168 | 5903 assert(pict->data[0]); |
| 5904 //printf("out %d\n", (int)pict->data[0]); | |
| 5905 #if 0 //? | |
| 5906 | |
| 5907 /* Return the Picture timestamp as the frame number */ | |
| 5908 /* we substract 1 because it is added on utils.c */ | |
| 5909 avctx->frame_number = s->picture_number - 1; | |
| 5910 #endif | |
| 5911 #if 0 | |
| 5912 /* dont output the last pic after seeking */ | |
| 5913 if(s->last_picture_ptr || s->low_delay) | |
| 5914 //Note this isnt a issue as a IDR pic should flush teh buffers | |
| 5915 #endif | |
| 5916 *data_size = sizeof(AVFrame); | |
| 5917 return get_consumed_bytes(s, buf_index, buf_size); | |
| 5918 } | |
| 5919 #if 0 | |
| 5920 static inline void fill_mb_avail(H264Context *h){ | |
| 5921 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
|
5922 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 5923 |
| 5924 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
|
5925 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
|
5926 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
|
5927 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num; |
| 1168 | 5928 }else{ |
| 5929 h->mb_avail[0]= | |
| 5930 h->mb_avail[1]= | |
| 5931 h->mb_avail[2]= 0; | |
| 5932 } | |
| 5933 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num; | |
| 5934 h->mb_avail[4]= 1; //FIXME move out | |
| 5935 h->mb_avail[5]= 0; //FIXME move out | |
| 5936 } | |
| 5937 #endif | |
| 5938 | |
| 5939 #if 0 //selftest | |
| 5940 #define COUNT 8000 | |
| 5941 #define SIZE (COUNT*40) | |
| 5942 int main(){ | |
| 5943 int i; | |
| 5944 uint8_t temp[SIZE]; | |
| 5945 PutBitContext pb; | |
| 5946 GetBitContext gb; | |
| 5947 // int int_temp[10000]; | |
| 5948 DSPContext dsp; | |
| 5949 AVCodecContext avctx; | |
| 5950 | |
| 5951 dsputil_init(&dsp, &avctx); | |
| 5952 | |
|
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1453
diff
changeset
|
5953 init_put_bits(&pb, temp, SIZE); |
| 1168 | 5954 printf("testing unsigned exp golomb\n"); |
| 5955 for(i=0; i<COUNT; i++){ | |
| 5956 START_TIMER | |
| 5957 set_ue_golomb(&pb, i); | |
| 5958 STOP_TIMER("set_ue_golomb"); | |
| 5959 } | |
| 5960 flush_put_bits(&pb); | |
| 5961 | |
| 5962 init_get_bits(&gb, temp, 8*SIZE); | |
| 5963 for(i=0; i<COUNT; i++){ | |
| 5964 int j, s; | |
| 5965 | |
| 5966 s= show_bits(&gb, 24); | |
| 5967 | |
| 5968 START_TIMER | |
| 5969 j= get_ue_golomb(&gb); | |
| 5970 if(j != i){ | |
| 5971 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
| 5972 // return -1; | |
| 5973 } | |
| 5974 STOP_TIMER("get_ue_golomb"); | |
| 5975 } | |
| 5976 | |
| 5977 | |
| 1524 | 5978 init_put_bits(&pb, temp, SIZE); |
| 1168 | 5979 printf("testing signed exp golomb\n"); |
| 5980 for(i=0; i<COUNT; i++){ | |
| 5981 START_TIMER | |
| 5982 set_se_golomb(&pb, i - COUNT/2); | |
| 5983 STOP_TIMER("set_se_golomb"); | |
| 5984 } | |
| 5985 flush_put_bits(&pb); | |
| 5986 | |
| 5987 init_get_bits(&gb, temp, 8*SIZE); | |
| 5988 for(i=0; i<COUNT; i++){ | |
| 5989 int j, s; | |
| 5990 | |
| 5991 s= show_bits(&gb, 24); | |
| 5992 | |
| 5993 START_TIMER | |
| 5994 j= get_se_golomb(&gb); | |
| 5995 if(j != i - COUNT/2){ | |
| 5996 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
| 5997 // return -1; | |
| 5998 } | |
| 5999 STOP_TIMER("get_se_golomb"); | |
| 6000 } | |
| 6001 | |
| 6002 printf("testing 4x4 (I)DCT\n"); | |
| 6003 | |
| 6004 DCTELEM block[16]; | |
| 6005 uint8_t src[16], ref[16]; | |
| 6006 uint64_t error= 0, max_error=0; | |
| 6007 | |
| 6008 for(i=0; i<COUNT; i++){ | |
| 6009 int j; | |
| 6010 // printf("%d %d %d\n", r1, r2, (r2-r1)*16); | |
| 6011 for(j=0; j<16; j++){ | |
| 6012 ref[j]= random()%255; | |
| 6013 src[j]= random()%255; | |
| 6014 } | |
| 6015 | |
| 6016 h264_diff_dct_c(block, src, ref, 4); | |
| 6017 | |
| 6018 //normalize | |
| 6019 for(j=0; j<16; j++){ | |
| 6020 // printf("%d ", block[j]); | |
| 6021 block[j]= block[j]*4; | |
| 6022 if(j&1) block[j]= (block[j]*4 + 2)/5; | |
| 6023 if(j&4) block[j]= (block[j]*4 + 2)/5; | |
| 6024 } | |
| 6025 // printf("\n"); | |
| 6026 | |
|
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
6027 s->dsp.h264_idct_add(ref, block, 4); |
| 1168 | 6028 /* for(j=0; j<16; j++){ |
| 6029 printf("%d ", ref[j]); | |
| 6030 } | |
| 6031 printf("\n");*/ | |
| 6032 | |
| 6033 for(j=0; j<16; j++){ | |
| 6034 int diff= ABS(src[j] - ref[j]); | |
| 6035 | |
| 6036 error+= diff*diff; | |
| 6037 max_error= FFMAX(max_error, diff); | |
| 6038 } | |
| 6039 } | |
| 6040 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error ); | |
| 6041 #if 0 | |
| 6042 printf("testing quantizer\n"); | |
| 6043 for(qp=0; qp<52; qp++){ | |
| 6044 for(i=0; i<16; i++) | |
| 6045 src1_block[i]= src2_block[i]= random()%255; | |
| 6046 | |
| 6047 } | |
| 6048 #endif | |
| 6049 printf("Testing NAL layer\n"); | |
| 6050 | |
| 6051 uint8_t bitstream[COUNT]; | |
| 6052 uint8_t nal[COUNT*2]; | |
| 6053 H264Context h; | |
| 6054 memset(&h, 0, sizeof(H264Context)); | |
| 6055 | |
| 6056 for(i=0; i<COUNT; i++){ | |
| 6057 int zeros= i; | |
| 6058 int nal_length; | |
| 6059 int consumed; | |
| 6060 int out_length; | |
| 6061 uint8_t *out; | |
| 6062 int j; | |
| 6063 | |
| 6064 for(j=0; j<COUNT; j++){ | |
| 6065 bitstream[j]= (random() % 255) + 1; | |
| 6066 } | |
| 6067 | |
| 6068 for(j=0; j<zeros; j++){ | |
| 6069 int pos= random() % COUNT; | |
| 6070 while(bitstream[pos] == 0){ | |
| 6071 pos++; | |
| 6072 pos %= COUNT; | |
| 6073 } | |
| 6074 bitstream[pos]=0; | |
| 6075 } | |
| 6076 | |
| 6077 START_TIMER | |
| 6078 | |
| 6079 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2); | |
| 6080 if(nal_length<0){ | |
| 6081 printf("encoding failed\n"); | |
| 6082 return -1; | |
| 6083 } | |
| 6084 | |
| 6085 out= decode_nal(&h, nal, &out_length, &consumed, nal_length); | |
| 6086 | |
| 6087 STOP_TIMER("NAL") | |
| 6088 | |
| 6089 if(out_length != COUNT){ | |
| 6090 printf("incorrect length %d %d\n", out_length, COUNT); | |
| 6091 return -1; | |
| 6092 } | |
| 6093 | |
| 6094 if(consumed != nal_length){ | |
| 6095 printf("incorrect consumed length %d %d\n", nal_length, consumed); | |
| 6096 return -1; | |
| 6097 } | |
| 6098 | |
| 6099 if(memcmp(bitstream, out, COUNT)){ | |
| 6100 printf("missmatch\n"); | |
| 6101 return -1; | |
| 6102 } | |
| 6103 } | |
| 6104 | |
| 6105 printf("Testing RBSP\n"); | |
| 6106 | |
| 6107 | |
| 6108 return 0; | |
| 6109 } | |
| 6110 #endif | |
| 6111 | |
| 6112 | |
| 6113 static int decode_end(AVCodecContext *avctx) | |
| 6114 { | |
| 6115 H264Context *h = avctx->priv_data; | |
| 6116 MpegEncContext *s = &h->s; | |
| 6117 | |
| 6118 free_tables(h); //FIXME cleanup init stuff perhaps | |
| 6119 MPV_common_end(s); | |
| 6120 | |
| 6121 // memset(h, 0, sizeof(H264Context)); | |
| 6122 | |
| 6123 return 0; | |
| 6124 } | |
| 6125 | |
| 6126 | |
| 6127 AVCodec h264_decoder = { | |
| 6128 "h264", | |
| 6129 CODEC_TYPE_VIDEO, | |
| 6130 CODEC_ID_H264, | |
| 6131 sizeof(H264Context), | |
| 6132 decode_init, | |
| 6133 NULL, | |
| 6134 decode_end, | |
| 6135 decode_frame, | |
| 1214 | 6136 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED, |
| 1168 | 6137 }; |
| 6138 | |
| 1988 | 6139 AVCodecParser h264_parser = { |
| 6140 { CODEC_ID_H264 }, | |
| 6141 sizeof(ParseContext), | |
| 6142 NULL, | |
| 6143 h264_parse, | |
| 6144 ff_parse_close, | |
| 6145 }; | |
| 6146 | |
| 1234 | 6147 #include "svq3.c" |
