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