Mercurial > libavcodec.hg
annotate h264.c @ 2580:b4f6f89ec2f6 libavcodec
The cvs version 1.103 of h264.c brokes 13 conformance streams, this
patch corrects this and decodes the same streams as version 1.102.
patch by (Lo?c Le Loarer <lll+ffmpeg m4x org>)
| author | michael |
|---|---|
| date | Sun, 27 Mar 2005 00:27:37 +0000 |
| parents | eb72c01df6ed |
| children | ae72796e722f |
| 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? |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
90 int bitstream_restriction_flag; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
91 int num_reorder_frames; |
| 1168 | 92 }SPS; |
| 93 | |
| 94 /** | |
| 95 * Picture parameter set | |
| 96 */ | |
| 97 typedef struct PPS{ | |
| 98 int sps_id; | |
| 99 int cabac; ///< entropy_coding_mode_flag | |
| 100 int pic_order_present; ///< pic_order_present_flag | |
| 101 int slice_group_count; ///< num_slice_groups_minus1 + 1 | |
| 102 int mb_slice_group_map_type; | |
| 103 int ref_count[2]; ///< num_ref_idx_l0/1_active_minus1 + 1 | |
| 104 int weighted_pred; ///< weighted_pred_flag | |
| 105 int weighted_bipred_idc; | |
| 106 int init_qp; ///< pic_init_qp_minus26 + 26 | |
| 107 int init_qs; ///< pic_init_qs_minus26 + 26 | |
| 108 int chroma_qp_index_offset; | |
| 109 int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag | |
| 110 int constrained_intra_pred; ///< constrained_intra_pred_flag | |
| 111 int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag | |
| 112 }PPS; | |
| 113 | |
| 114 /** | |
| 115 * Memory management control operation opcode. | |
| 116 */ | |
| 117 typedef enum MMCOOpcode{ | |
| 118 MMCO_END=0, | |
| 119 MMCO_SHORT2UNUSED, | |
| 120 MMCO_LONG2UNUSED, | |
| 121 MMCO_SHORT2LONG, | |
| 122 MMCO_SET_MAX_LONG, | |
| 123 MMCO_RESET, | |
| 124 MMCO_LONG, | |
| 125 } MMCOOpcode; | |
| 126 | |
| 127 /** | |
| 128 * Memory management control operation. | |
| 129 */ | |
| 130 typedef struct MMCO{ | |
| 131 MMCOOpcode opcode; | |
| 132 int short_frame_num; | |
| 133 int long_index; | |
| 134 } MMCO; | |
| 135 | |
| 136 /** | |
| 137 * H264Context | |
| 138 */ | |
| 139 typedef struct H264Context{ | |
| 140 MpegEncContext s; | |
| 141 int nal_ref_idc; | |
| 142 int nal_unit_type; | |
| 143 #define NAL_SLICE 1 | |
| 144 #define NAL_DPA 2 | |
| 145 #define NAL_DPB 3 | |
| 146 #define NAL_DPC 4 | |
| 147 #define NAL_IDR_SLICE 5 | |
| 148 #define NAL_SEI 6 | |
| 149 #define NAL_SPS 7 | |
| 150 #define NAL_PPS 8 | |
| 151 #define NAL_PICTURE_DELIMITER 9 | |
| 152 #define NAL_FILTER_DATA 10 | |
| 153 uint8_t *rbsp_buffer; | |
| 154 int rbsp_buffer_size; | |
| 155 | |
| 2227 | 156 /** |
| 157 * Used to parse AVC variant of h264 | |
| 158 */ | |
| 159 int is_avc; ///< this flag is != 0 if codec is avc1 | |
| 160 int got_avcC; ///< flag used to parse avcC data only once | |
| 161 int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) | |
| 162 | |
| 1168 | 163 int chroma_qp; //QPc |
| 164 | |
| 165 int prev_mb_skiped; //FIXME remove (IMHO not used) | |
| 166 | |
| 167 //prediction stuff | |
| 168 int chroma_pred_mode; | |
| 169 int intra16x16_pred_mode; | |
| 170 | |
| 171 int8_t intra4x4_pred_mode_cache[5*8]; | |
| 172 int8_t (*intra4x4_pred_mode)[8]; | |
| 173 void (*pred4x4 [9+3])(uint8_t *src, uint8_t *topright, int stride);//FIXME move to dsp? | |
| 174 void (*pred8x8 [4+3])(uint8_t *src, int stride); | |
| 175 void (*pred16x16[4+3])(uint8_t *src, int stride); | |
| 176 unsigned int topleft_samples_available; | |
| 177 unsigned int top_samples_available; | |
| 178 unsigned int topright_samples_available; | |
| 179 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
|
180 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
|
181 uint8_t left_border[17+2*9]; |
| 1168 | 182 |
| 183 /** | |
| 184 * non zero coeff count cache. | |
| 185 * is 64 if not available. | |
| 186 */ | |
|
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
187 uint8_t non_zero_count_cache[6*8] __align8; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
188 uint8_t (*non_zero_count)[16]; |
| 1168 | 189 |
| 190 /** | |
| 191 * Motion vector cache. | |
| 192 */ | |
|
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
193 int16_t mv_cache[2][5*8][2] __align8; |
|
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
194 int8_t ref_cache[2][5*8] __align8; |
| 1168 | 195 #define LIST_NOT_USED -1 //FIXME rename? |
| 196 #define PART_NOT_AVAILABLE -2 | |
| 197 | |
| 198 /** | |
| 199 * is 1 if the specific list MV&references are set to 0,0,-2. | |
| 200 */ | |
| 201 int mv_cache_clean[2]; | |
| 202 | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
203 /** |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
204 * block_offset[ 0..23] for frame macroblocks |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
205 * block_offset[24..47] for field macroblocks |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
206 */ |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
207 int block_offset[2*(16+8)]; |
| 1168 | 208 |
| 209 uint16_t *mb2b_xy; //FIXME are these 4 a good idea? | |
| 210 uint16_t *mb2b8_xy; | |
| 2395 | 211 int b_stride; //FIXME use s->b4_stride |
| 1168 | 212 int b8_stride; |
| 213 | |
| 1234 | 214 int halfpel_flag; |
| 215 int thirdpel_flag; | |
| 216 | |
| 1319 | 217 int unknown_svq3_flag; |
| 218 int next_slice_index; | |
| 219 | |
| 1168 | 220 SPS sps_buffer[MAX_SPS_COUNT]; |
| 221 SPS sps; ///< current sps | |
| 222 | |
| 223 PPS pps_buffer[MAX_PPS_COUNT]; | |
| 224 /** | |
| 225 * current pps | |
| 226 */ | |
| 227 PPS pps; //FIXME move tp Picture perhaps? (->no) do we need that? | |
| 228 | |
| 229 int slice_num; | |
| 230 uint8_t *slice_table_base; | |
| 231 uint8_t *slice_table; ///< slice_table_base + mb_stride + 1 | |
| 232 int slice_type; | |
| 233 int slice_type_fixed; | |
| 234 | |
| 235 //interlacing specific flags | |
| 236 int mb_field_decoding_flag; | |
| 237 | |
| 238 int sub_mb_type[4]; | |
| 239 | |
| 240 //POC stuff | |
| 241 int poc_lsb; | |
| 242 int poc_msb; | |
| 243 int delta_poc_bottom; | |
| 244 int delta_poc[2]; | |
| 245 int frame_num; | |
| 246 int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0 | |
| 247 int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0 | |
| 248 int frame_num_offset; ///< for POC type 2 | |
| 249 int prev_frame_num_offset; ///< for POC type 2 | |
| 250 int prev_frame_num; ///< frame_num of the last pic for POC type 1/2 | |
| 251 | |
| 252 /** | |
| 253 * frame_num for frames or 2*frame_num for field pics. | |
| 254 */ | |
| 255 int curr_pic_num; | |
| 256 | |
| 257 /** | |
| 258 * max_frame_num or 2*max_frame_num for field pics. | |
| 259 */ | |
| 260 int max_pic_num; | |
| 261 | |
| 262 //Weighted pred stuff | |
| 2415 | 263 int use_weight; |
| 264 int use_weight_chroma; | |
| 1168 | 265 int luma_log2_weight_denom; |
| 266 int chroma_log2_weight_denom; | |
| 267 int luma_weight[2][16]; | |
| 268 int luma_offset[2][16]; | |
| 269 int chroma_weight[2][16][2]; | |
| 270 int chroma_offset[2][16][2]; | |
| 2415 | 271 int implicit_weight[16][16]; |
| 1168 | 272 |
| 273 //deblock | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
274 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
|
275 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
|
276 int slice_beta_offset; |
| 1168 | 277 |
| 278 int redundant_pic_count; | |
| 279 | |
| 280 int direct_spatial_mv_pred; | |
| 2396 | 281 int dist_scale_factor[16]; |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
282 int map_col_to_list0[2][16]; |
| 1168 | 283 |
| 284 /** | |
| 285 * num_ref_idx_l0/1_active_minus1 + 1 | |
| 286 */ | |
| 287 int ref_count[2];// FIXME split for AFF | |
| 288 Picture *short_ref[16]; | |
| 289 Picture *long_ref[16]; | |
| 290 Picture default_ref_list[2][32]; | |
| 291 Picture ref_list[2][32]; //FIXME size? | |
| 292 Picture field_ref_list[2][32]; //FIXME size? | |
| 2409 | 293 Picture *delayed_pic[16]; //FIXME size? |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
294 Picture *delayed_output_pic; |
| 1168 | 295 |
| 296 /** | |
| 297 * memory management control operations buffer. | |
| 298 */ | |
| 299 MMCO mmco[MAX_MMCO_COUNT]; | |
| 300 int mmco_index; | |
| 301 | |
| 302 int long_ref_count; ///< number of actual long term references | |
| 303 int short_ref_count; ///< number of actual short term references | |
| 304 | |
| 305 //data partitioning | |
| 306 GetBitContext intra_gb; | |
| 307 GetBitContext inter_gb; | |
| 308 GetBitContext *intra_gb_ptr; | |
| 309 GetBitContext *inter_gb_ptr; | |
| 310 | |
| 311 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
|
312 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
313 /** |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
314 * Cabac |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
315 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
316 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
|
317 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
|
318 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
|
319 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
320 /* 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
|
321 uint16_t *cbp_table; |
| 2314 | 322 int top_cbp; |
| 323 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
|
324 /* 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
|
325 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
|
326 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
|
327 int16_t (*mvd_table[2])[2]; |
|
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
328 int16_t mvd_cache[2][5*8][2] __align8; |
| 2396 | 329 uint8_t *direct_table; |
| 330 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
|
331 |
| 1168 | 332 }H264Context; |
| 333 | |
| 334 static VLC coeff_token_vlc[4]; | |
| 335 static VLC chroma_dc_coeff_token_vlc; | |
| 336 | |
| 337 static VLC total_zeros_vlc[15]; | |
| 338 static VLC chroma_dc_total_zeros_vlc[3]; | |
| 339 | |
| 340 static VLC run_vlc[6]; | |
| 341 static VLC run7_vlc; | |
| 342 | |
| 1234 | 343 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); |
| 344 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
|
345 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 | 346 |
| 1269 | 347 static inline uint32_t pack16to32(int a, int b){ |
| 348 #ifdef WORDS_BIGENDIAN | |
| 349 return (b&0xFFFF) + (a<<16); | |
| 350 #else | |
| 351 return (a&0xFFFF) + (b<<16); | |
| 352 #endif | |
| 353 } | |
| 354 | |
| 1168 | 355 /** |
| 356 * fill a rectangle. | |
| 2392 | 357 * @param h height of the rectangle, should be a constant |
| 358 * @param w width of the rectangle, should be a constant | |
| 1168 | 359 * @param size the size of val (1 or 4), should be a constant |
| 360 */ | |
| 1187 | 361 static inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){ //FIXME ensure this IS inlined |
| 362 uint8_t *p= (uint8_t*)vp; | |
| 1168 | 363 assert(size==1 || size==4); |
| 364 | |
| 365 w *= size; | |
| 366 stride *= size; | |
| 367 | |
|
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
368 assert((((int)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0); |
| 1168 | 369 //FIXME check what gcc generates for 64 bit on x86 and possible write a 32 bit ver of it |
| 370 if(w==2 && h==2){ | |
| 371 *(uint16_t*)(p + 0)= | |
| 372 *(uint16_t*)(p + stride)= size==4 ? val : val*0x0101; | |
| 373 }else if(w==2 && h==4){ | |
| 374 *(uint16_t*)(p + 0*stride)= | |
| 375 *(uint16_t*)(p + 1*stride)= | |
| 376 *(uint16_t*)(p + 2*stride)= | |
| 377 *(uint16_t*)(p + 3*stride)= size==4 ? val : val*0x0101; | |
| 1252 | 378 }else if(w==4 && h==1){ |
| 379 *(uint32_t*)(p + 0*stride)= size==4 ? val : val*0x01010101; | |
| 1168 | 380 }else if(w==4 && h==2){ |
| 381 *(uint32_t*)(p + 0*stride)= | |
| 382 *(uint32_t*)(p + 1*stride)= size==4 ? val : val*0x01010101; | |
| 383 }else if(w==4 && h==4){ | |
| 384 *(uint32_t*)(p + 0*stride)= | |
| 385 *(uint32_t*)(p + 1*stride)= | |
| 386 *(uint32_t*)(p + 2*stride)= | |
| 387 *(uint32_t*)(p + 3*stride)= size==4 ? val : val*0x01010101; | |
| 388 }else if(w==8 && h==1){ | |
| 389 *(uint32_t*)(p + 0)= | |
| 390 *(uint32_t*)(p + 4)= size==4 ? val : val*0x01010101; | |
| 391 }else if(w==8 && h==2){ | |
| 392 *(uint32_t*)(p + 0 + 0*stride)= | |
| 393 *(uint32_t*)(p + 4 + 0*stride)= | |
| 394 *(uint32_t*)(p + 0 + 1*stride)= | |
| 395 *(uint32_t*)(p + 4 + 1*stride)= size==4 ? val : val*0x01010101; | |
| 396 }else if(w==8 && h==4){ | |
| 397 *(uint64_t*)(p + 0*stride)= | |
| 398 *(uint64_t*)(p + 1*stride)= | |
| 399 *(uint64_t*)(p + 2*stride)= | |
| 400 *(uint64_t*)(p + 3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
| 401 }else if(w==16 && h==2){ | |
| 402 *(uint64_t*)(p + 0+0*stride)= | |
| 403 *(uint64_t*)(p + 8+0*stride)= | |
| 404 *(uint64_t*)(p + 0+1*stride)= | |
| 405 *(uint64_t*)(p + 8+1*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
| 406 }else if(w==16 && h==4){ | |
| 407 *(uint64_t*)(p + 0+0*stride)= | |
| 408 *(uint64_t*)(p + 8+0*stride)= | |
| 409 *(uint64_t*)(p + 0+1*stride)= | |
| 410 *(uint64_t*)(p + 8+1*stride)= | |
| 411 *(uint64_t*)(p + 0+2*stride)= | |
| 412 *(uint64_t*)(p + 8+2*stride)= | |
| 413 *(uint64_t*)(p + 0+3*stride)= | |
| 414 *(uint64_t*)(p + 8+3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
| 415 }else | |
| 416 assert(0); | |
| 417 } | |
| 418 | |
| 2449 | 419 static inline void fill_caches(H264Context *h, int mb_type, int for_deblock){ |
| 1168 | 420 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
|
421 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 422 int topleft_xy, top_xy, topright_xy, left_xy[2]; |
| 423 int topleft_type, top_type, topright_type, left_type[2]; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
424 int left_block[8]; |
| 1168 | 425 int i; |
| 426 | |
| 427 //wow what a mess, why didnt they simplify the interlacing&intra stuff, i cant imagine that these complex rules are worth it | |
| 428 | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
429 top_xy = mb_xy - s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
430 topleft_xy = top_xy - 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
431 topright_xy= top_xy + 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
432 left_xy[1] = left_xy[0] = mb_xy-1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
433 left_block[0]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
434 left_block[1]= 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
435 left_block[2]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
436 left_block[3]= 3; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
437 left_block[4]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
438 left_block[5]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
439 left_block[6]= 8; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
440 left_block[7]= 11; |
| 1168 | 441 if(h->sps.mb_aff){ |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
442 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
443 const int top_pair_xy = pair_xy - s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
444 const int topleft_pair_xy = top_pair_xy - 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
445 const int topright_pair_xy = top_pair_xy + 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
446 const int topleft_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topleft_pair_xy]); |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
447 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]); |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
448 const int topright_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topright_pair_xy]); |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
449 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]); |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
450 const int curr_mb_frame_flag = !IS_INTERLACED(mb_type); |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
451 const int bottom = (s->mb_y & 1); |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
452 tprintf("fill_caches: curr_mb_frame_flag:%d, left_mb_frame_flag:%d, topleft_mb_frame_flag:%d, top_mb_frame_flag:%d, topright_mb_frame_flag:%d\n", curr_mb_frame_flag, left_mb_frame_flag, topleft_mb_frame_flag, top_mb_frame_flag, topright_mb_frame_flag); |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
453 if (bottom |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
454 ? !curr_mb_frame_flag // bottom macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
455 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
456 ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
457 top_xy -= s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
458 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
459 if (bottom |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
460 ? !curr_mb_frame_flag // bottom macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
461 : (!curr_mb_frame_flag && !topleft_mb_frame_flag) // top macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
462 ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
463 topleft_xy -= s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
464 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
465 if (bottom |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
466 ? !curr_mb_frame_flag // bottom macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
467 : (!curr_mb_frame_flag && !topright_mb_frame_flag) // top macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
468 ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
469 topright_xy -= s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
470 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
471 if (left_mb_frame_flag != curr_mb_frame_flag) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
472 left_xy[1] = left_xy[0] = pair_xy - 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
473 if (curr_mb_frame_flag) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
474 if (bottom) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
475 left_block[0]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
476 left_block[1]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
477 left_block[2]= 3; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
478 left_block[3]= 3; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
479 left_block[4]= 8; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
480 left_block[5]= 11; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
481 left_block[6]= 8; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
482 left_block[7]= 11; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
483 } else { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
484 left_block[0]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
485 left_block[1]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
486 left_block[2]= 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
487 left_block[3]= 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
488 left_block[4]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
489 left_block[5]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
490 left_block[6]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
491 left_block[7]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
492 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
493 } else { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
494 left_xy[1] += s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
495 //left_block[0]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
496 left_block[1]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
497 left_block[2]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
498 left_block[3]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
499 //left_block[4]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
500 left_block[5]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
501 left_block[6]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
502 left_block[7]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
503 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
504 } |
| 1168 | 505 } |
| 506 | |
| 2449 | 507 if(for_deblock){ |
| 508 topleft_type = h->slice_table[topleft_xy ] < 255 ? s->current_picture.mb_type[topleft_xy] : 0; | |
| 509 top_type = h->slice_table[top_xy ] < 255 ? s->current_picture.mb_type[top_xy] : 0; | |
| 510 topright_type= h->slice_table[topright_xy] < 255 ? s->current_picture.mb_type[topright_xy]: 0; | |
| 511 left_type[0] = h->slice_table[left_xy[0] ] < 255 ? s->current_picture.mb_type[left_xy[0]] : 0; | |
| 512 left_type[1] = h->slice_table[left_xy[1] ] < 255 ? s->current_picture.mb_type[left_xy[1]] : 0; | |
| 513 }else{ | |
| 514 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0; | |
| 515 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0; | |
| 516 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0; | |
| 517 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0; | |
| 518 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0; | |
| 519 } | |
| 1168 | 520 |
| 521 if(IS_INTRA(mb_type)){ | |
| 522 h->topleft_samples_available= | |
| 523 h->top_samples_available= | |
| 524 h->left_samples_available= 0xFFFF; | |
| 525 h->topright_samples_available= 0xEEEA; | |
| 526 | |
| 527 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){ | |
| 528 h->topleft_samples_available= 0xB3FF; | |
| 529 h->top_samples_available= 0x33FF; | |
| 530 h->topright_samples_available= 0x26EA; | |
| 531 } | |
| 532 for(i=0; i<2; i++){ | |
| 533 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){ | |
| 534 h->topleft_samples_available&= 0xDF5F; | |
| 535 h->left_samples_available&= 0x5F5F; | |
| 536 } | |
| 537 } | |
| 538 | |
| 539 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred)) | |
| 540 h->topleft_samples_available&= 0x7FFF; | |
| 541 | |
| 542 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred)) | |
| 543 h->topright_samples_available&= 0xFBFF; | |
| 544 | |
| 545 if(IS_INTRA4x4(mb_type)){ | |
| 546 if(IS_INTRA4x4(top_type)){ | |
| 547 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4]; | |
| 548 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5]; | |
| 549 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6]; | |
| 550 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3]; | |
| 551 }else{ | |
| 552 int pred; | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
553 if(!top_type || (IS_INTER(top_type) && h->pps.constrained_intra_pred)) |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
554 pred= -1; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
555 else{ |
| 1168 | 556 pred= 2; |
| 557 } | |
| 558 h->intra4x4_pred_mode_cache[4+8*0]= | |
| 559 h->intra4x4_pred_mode_cache[5+8*0]= | |
| 560 h->intra4x4_pred_mode_cache[6+8*0]= | |
| 561 h->intra4x4_pred_mode_cache[7+8*0]= pred; | |
| 562 } | |
| 563 for(i=0; i<2; i++){ | |
| 564 if(IS_INTRA4x4(left_type[i])){ | |
| 565 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[0+2*i]]; | |
| 566 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[1+2*i]]; | |
| 567 }else{ | |
| 568 int pred; | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
569 if(!left_type[i] || (IS_INTER(left_type[i]) && h->pps.constrained_intra_pred)) |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
570 pred= -1; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
571 else{ |
| 1168 | 572 pred= 2; |
| 573 } | |
| 574 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= | |
| 575 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred; | |
| 576 } | |
| 577 } | |
| 578 } | |
| 579 } | |
| 580 | |
| 581 | |
| 582 /* | |
| 583 0 . T T. T T T T | |
| 584 1 L . .L . . . . | |
| 585 2 L . .L . . . . | |
| 586 3 . T TL . . . . | |
| 587 4 L . .L . . . . | |
| 588 5 L . .. . . . . | |
| 589 */ | |
| 590 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec) | |
| 591 if(top_type){ | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
592 h->non_zero_count_cache[4+8*0]= h->non_zero_count[top_xy][4]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
593 h->non_zero_count_cache[5+8*0]= h->non_zero_count[top_xy][5]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
594 h->non_zero_count_cache[6+8*0]= h->non_zero_count[top_xy][6]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
595 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3]; |
| 1168 | 596 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
597 h->non_zero_count_cache[1+8*0]= h->non_zero_count[top_xy][9]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
598 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8]; |
| 1168 | 599 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
600 h->non_zero_count_cache[1+8*3]= h->non_zero_count[top_xy][12]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
601 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11]; |
| 2314 | 602 |
| 603 h->top_cbp= h->cbp_table[top_xy]; | |
| 1168 | 604 }else{ |
| 605 h->non_zero_count_cache[4+8*0]= | |
| 606 h->non_zero_count_cache[5+8*0]= | |
| 607 h->non_zero_count_cache[6+8*0]= | |
| 608 h->non_zero_count_cache[7+8*0]= | |
| 609 | |
| 610 h->non_zero_count_cache[1+8*0]= | |
| 611 h->non_zero_count_cache[2+8*0]= | |
| 612 | |
| 613 h->non_zero_count_cache[1+8*3]= | |
| 2314 | 614 h->non_zero_count_cache[2+8*3]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
| 615 | |
| 616 if(IS_INTRA(mb_type)) h->top_cbp= 0x1C0; | |
| 617 else h->top_cbp= 0; | |
| 1168 | 618 } |
| 619 | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
620 for (i=0; i<2; i++) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
621 if(left_type[i]){ |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
622 h->non_zero_count_cache[3+8*1 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[0+2*i]]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
623 h->non_zero_count_cache[3+8*2 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[1+2*i]]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
624 h->non_zero_count_cache[0+8*1 + 8*i]= h->non_zero_count[left_xy[i]][left_block[4+2*i]]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
625 h->non_zero_count_cache[0+8*4 + 8*i]= h->non_zero_count[left_xy[i]][left_block[5+2*i]]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
626 h->left_cbp= h->cbp_table[left_xy[i]]; //FIXME interlacing |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
627 }else{ |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
628 h->non_zero_count_cache[3+8*1 + 2*8*i]= |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
629 h->non_zero_count_cache[3+8*2 + 2*8*i]= |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
630 h->non_zero_count_cache[0+8*1 + 8*i]= |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
631 h->non_zero_count_cache[0+8*4 + 8*i]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
632 |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
633 if(IS_INTRA(mb_type)) h->left_cbp= 0x1C0;//FIXME interlacing |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
634 else h->left_cbp= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
635 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
636 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
637 |
| 1168 | 638 #if 1 |
| 2396 | 639 //FIXME direct mb can skip much of this |
| 640 if(IS_INTER(mb_type) || (IS_DIRECT(mb_type) && h->direct_spatial_mv_pred)){ | |
| 1168 | 641 int list; |
| 642 for(list=0; list<2; list++){ | |
| 2535 | 643 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !for_deblock){ |
| 1168 | 644 /*if(!h->mv_cache_clean[list]){ |
| 645 memset(h->mv_cache [list], 0, 8*5*2*sizeof(int16_t)); //FIXME clean only input? clean at all? | |
| 646 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t)); | |
| 647 h->mv_cache_clean[list]= 1; | |
| 648 }*/ | |
| 2396 | 649 continue; |
| 1168 | 650 } |
| 651 h->mv_cache_clean[list]= 0; | |
| 652 | |
| 653 if(IS_INTER(topleft_type)){ | |
| 654 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride; | |
| 655 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride; | |
| 656 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; | |
| 657 h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy]; | |
| 658 }else{ | |
| 659 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= 0; | |
| 660 h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
| 661 } | |
| 662 | |
| 663 if(IS_INTER(top_type)){ | |
| 664 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; | |
| 665 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride; | |
| 666 *(uint32_t*)h->mv_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 0]; | |
| 667 *(uint32_t*)h->mv_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 1]; | |
| 668 *(uint32_t*)h->mv_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 2]; | |
| 669 *(uint32_t*)h->mv_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 3]; | |
| 670 h->ref_cache[list][scan8[0] + 0 - 1*8]= | |
| 671 h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][b8_xy + 0]; | |
| 672 h->ref_cache[list][scan8[0] + 2 - 1*8]= | |
| 673 h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][b8_xy + 1]; | |
| 674 }else{ | |
| 675 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]= | |
| 676 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]= | |
| 677 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]= | |
| 678 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0; | |
| 679 *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101; | |
| 680 } | |
| 681 | |
| 682 if(IS_INTER(topright_type)){ | |
| 683 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride; | |
| 684 const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride; | |
| 685 *(uint32_t*)h->mv_cache[list][scan8[0] + 4 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; | |
| 686 h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][b8_xy]; | |
| 687 }else{ | |
| 688 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0; | |
| 689 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
| 690 } | |
| 691 | |
| 692 //FIXME unify cleanup or sth | |
| 693 if(IS_INTER(left_type[0])){ | |
| 694 const int b_xy= h->mb2b_xy[left_xy[0]] + 3; | |
| 695 const int b8_xy= h->mb2b8_xy[left_xy[0]] + 1; | |
| 696 *(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]]; | |
| 697 *(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]]; | |
| 698 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
| 699 h->ref_cache[list][scan8[0] - 1 + 1*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0]>>1)]; | |
| 700 }else{ | |
| 701 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 0*8]= | |
| 702 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 1*8]= 0; | |
| 703 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
| 704 h->ref_cache[list][scan8[0] - 1 + 1*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
| 705 } | |
| 706 | |
| 707 if(IS_INTER(left_type[1])){ | |
| 708 const int b_xy= h->mb2b_xy[left_xy[1]] + 3; | |
| 709 const int b8_xy= h->mb2b8_xy[left_xy[1]] + 1; | |
| 710 *(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]]; | |
| 711 *(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]]; | |
| 712 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
| 713 h->ref_cache[list][scan8[0] - 1 + 3*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[2]>>1)]; | |
| 714 }else{ | |
| 715 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 2*8]= | |
| 716 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 3*8]= 0; | |
| 717 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
| 718 h->ref_cache[list][scan8[0] - 1 + 3*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
| 719 } | |
| 720 | |
| 2449 | 721 if(for_deblock) |
| 722 continue; | |
| 723 | |
| 1168 | 724 h->ref_cache[list][scan8[5 ]+1] = |
| 725 h->ref_cache[list][scan8[7 ]+1] = | |
| 726 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewher else) | |
| 727 h->ref_cache[list][scan8[4 ]] = | |
| 728 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; | |
| 729 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]= | |
| 730 *(uint32_t*)h->mv_cache [list][scan8[7 ]+1]= | |
| 731 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewher else) | |
| 732 *(uint32_t*)h->mv_cache [list][scan8[4 ]]= | |
| 733 *(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
|
734 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
735 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
|
736 /* 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
|
737 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
|
738 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
|
739 *(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
|
740 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
741 *(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
|
742 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
743 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
744 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
|
745 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
|
746 *(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
|
747 *(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
|
748 *(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
|
749 *(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
|
750 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
751 *(uint32_t*)h->mvd_cache [list][scan8[0] + 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
|
752 *(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
|
753 *(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
|
754 *(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
|
755 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
756 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
|
757 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
|
758 *(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
|
759 *(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
|
760 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
761 *(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
|
762 *(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
|
763 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
764 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
|
765 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
|
766 *(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
|
767 *(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
|
768 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
769 *(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
|
770 *(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
|
771 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
772 *(uint32_t*)h->mvd_cache [list][scan8[5 ]+1]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
773 *(uint32_t*)h->mvd_cache [list][scan8[7 ]+1]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
774 *(uint32_t*)h->mvd_cache [list][scan8[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
|
775 *(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
|
776 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0; |
| 2396 | 777 |
| 778 if(h->slice_type == B_TYPE){ | |
| 779 fill_rectangle(&h->direct_cache[scan8[0]], 4, 4, 8, 0, 1); | |
| 780 | |
| 781 if(IS_DIRECT(top_type)){ | |
| 782 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101; | |
| 783 }else if(IS_8X8(top_type)){ | |
| 784 int b8_xy = h->mb2b8_xy[top_xy] + h->b8_stride; | |
| 785 h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy]; | |
| 786 h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 1]; | |
| 787 }else{ | |
| 788 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0; | |
| 789 } | |
| 790 | |
| 791 //FIXME interlacing | |
| 792 if(IS_DIRECT(left_type[0])){ | |
| 793 h->direct_cache[scan8[0] - 1 + 0*8]= | |
| 794 h->direct_cache[scan8[0] - 1 + 2*8]= 1; | |
| 795 }else if(IS_8X8(left_type[0])){ | |
| 796 int b8_xy = h->mb2b8_xy[left_xy[0]] + 1; | |
| 797 h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[b8_xy]; | |
| 798 h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[b8_xy + h->b8_stride]; | |
| 799 }else{ | |
| 800 h->direct_cache[scan8[0] - 1 + 0*8]= | |
| 801 h->direct_cache[scan8[0] - 1 + 2*8]= 0; | |
| 802 } | |
| 803 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
804 } |
| 1168 | 805 } |
| 806 } | |
| 807 #endif | |
| 808 } | |
| 809 | |
| 810 static inline void write_back_intra_pred_mode(H264Context *h){ | |
| 811 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
|
812 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 813 |
| 814 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1]; | |
| 815 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2]; | |
| 816 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3]; | |
| 817 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4]; | |
| 818 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4]; | |
| 819 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4]; | |
| 820 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4]; | |
| 821 } | |
| 822 | |
| 823 /** | |
| 824 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
| 825 */ | |
| 826 static inline int check_intra4x4_pred_mode(H264Context *h){ | |
| 827 MpegEncContext * const s = &h->s; | |
| 828 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0}; | |
| 829 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED}; | |
| 830 int i; | |
| 831 | |
| 832 if(!(h->top_samples_available&0x8000)){ | |
| 833 for(i=0; i<4; i++){ | |
| 834 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ]; | |
| 835 if(status<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
836 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 | 837 return -1; |
| 838 } else if(status){ | |
| 839 h->intra4x4_pred_mode_cache[scan8[0] + i]= status; | |
| 840 } | |
| 841 } | |
| 842 } | |
| 843 | |
| 844 if(!(h->left_samples_available&0x8000)){ | |
| 845 for(i=0; i<4; i++){ | |
| 846 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ]; | |
| 847 if(status<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
848 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 | 849 return -1; |
| 850 } else if(status){ | |
| 851 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status; | |
| 852 } | |
| 853 } | |
| 854 } | |
| 855 | |
| 856 return 0; | |
| 857 } //FIXME cleanup like next | |
| 858 | |
| 859 /** | |
| 860 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
| 861 */ | |
| 862 static inline int check_intra_pred_mode(H264Context *h, int mode){ | |
| 863 MpegEncContext * const s = &h->s; | |
| 864 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1}; | |
| 865 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8}; | |
| 866 | |
| 2392 | 867 if(mode < 0 || mode > 6) { |
| 868 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 | 869 return -1; |
| 2392 | 870 } |
| 2163 | 871 |
| 1168 | 872 if(!(h->top_samples_available&0x8000)){ |
| 873 mode= top[ mode ]; | |
| 874 if(mode<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
875 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 | 876 return -1; |
| 877 } | |
| 878 } | |
| 879 | |
| 880 if(!(h->left_samples_available&0x8000)){ | |
| 881 mode= left[ mode ]; | |
| 882 if(mode<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
883 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 | 884 return -1; |
| 885 } | |
| 886 } | |
| 887 | |
| 888 return mode; | |
| 889 } | |
| 890 | |
| 891 /** | |
| 892 * gets the predicted intra4x4 prediction mode. | |
| 893 */ | |
| 894 static inline int pred_intra_mode(H264Context *h, int n){ | |
| 895 const int index8= scan8[n]; | |
| 896 const int left= h->intra4x4_pred_mode_cache[index8 - 1]; | |
| 897 const int top = h->intra4x4_pred_mode_cache[index8 - 8]; | |
| 898 const int min= FFMIN(left, top); | |
| 899 | |
| 1170 | 900 tprintf("mode:%d %d min:%d\n", left ,top, min); |
| 1168 | 901 |
| 902 if(min<0) return DC_PRED; | |
| 903 else return min; | |
| 904 } | |
| 905 | |
| 906 static inline void write_back_non_zero_count(H264Context *h){ | |
| 907 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
|
908 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
|
909 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
910 h->non_zero_count[mb_xy][0]= h->non_zero_count_cache[7+8*1]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
911 h->non_zero_count[mb_xy][1]= h->non_zero_count_cache[7+8*2]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
912 h->non_zero_count[mb_xy][2]= h->non_zero_count_cache[7+8*3]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
913 h->non_zero_count[mb_xy][3]= h->non_zero_count_cache[7+8*4]; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
914 h->non_zero_count[mb_xy][4]= h->non_zero_count_cache[4+8*4]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
915 h->non_zero_count[mb_xy][5]= h->non_zero_count_cache[5+8*4]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
916 h->non_zero_count[mb_xy][6]= h->non_zero_count_cache[6+8*4]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
917 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
918 h->non_zero_count[mb_xy][9]= h->non_zero_count_cache[1+8*2]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
919 h->non_zero_count[mb_xy][8]= h->non_zero_count_cache[2+8*2]; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
920 h->non_zero_count[mb_xy][7]= h->non_zero_count_cache[2+8*1]; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
921 |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
922 h->non_zero_count[mb_xy][12]=h->non_zero_count_cache[1+8*5]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
923 h->non_zero_count[mb_xy][11]=h->non_zero_count_cache[2+8*5]; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
924 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[2+8*4]; |
| 1168 | 925 } |
| 926 | |
| 927 /** | |
| 928 * gets the predicted number of non zero coefficients. | |
| 929 * @param n block index | |
| 930 */ | |
| 931 static inline int pred_non_zero_count(H264Context *h, int n){ | |
| 932 const int index8= scan8[n]; | |
| 933 const int left= h->non_zero_count_cache[index8 - 1]; | |
| 934 const int top = h->non_zero_count_cache[index8 - 8]; | |
| 935 int i= left + top; | |
| 936 | |
| 937 if(i<64) i= (i+1)>>1; | |
| 938 | |
| 1170 | 939 tprintf("pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31); |
| 1168 | 940 |
| 941 return i&31; | |
| 942 } | |
| 943 | |
| 1169 | 944 static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width){ |
| 945 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ]; | |
| 946 | |
| 947 if(topright_ref != PART_NOT_AVAILABLE){ | |
| 948 *C= h->mv_cache[list][ i - 8 + part_width ]; | |
| 949 return topright_ref; | |
| 950 }else{ | |
| 1170 | 951 tprintf("topright MV not available\n"); |
| 952 | |
| 1169 | 953 *C= h->mv_cache[list][ i - 8 - 1 ]; |
| 954 return h->ref_cache[list][ i - 8 - 1 ]; | |
| 955 } | |
| 956 } | |
| 957 | |
| 1168 | 958 /** |
| 959 * gets the predicted MV. | |
| 960 * @param n the block index | |
| 961 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4) | |
| 962 * @param mx the x component of the predicted motion vector | |
| 963 * @param my the y component of the predicted motion vector | |
| 964 */ | |
| 965 static inline void pred_motion(H264Context * const h, int n, int part_width, int list, int ref, int * const mx, int * const my){ | |
| 966 const int index8= scan8[n]; | |
| 967 const int top_ref= h->ref_cache[list][ index8 - 8 ]; | |
| 968 const int left_ref= h->ref_cache[list][ index8 - 1 ]; | |
| 969 const int16_t * const A= h->mv_cache[list][ index8 - 1 ]; | |
| 970 const int16_t * const B= h->mv_cache[list][ index8 - 8 ]; | |
| 1169 | 971 const int16_t * C; |
| 972 int diagonal_ref, match_count; | |
| 973 | |
| 1168 | 974 assert(part_width==1 || part_width==2 || part_width==4); |
| 1169 | 975 |
| 1168 | 976 /* mv_cache |
| 977 B . . A T T T T | |
| 978 U . . L . . , . | |
| 979 U . . L . . . . | |
| 980 U . . L . . , . | |
| 981 . . . L . . . . | |
| 982 */ | |
| 1169 | 983 |
| 984 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width); | |
| 985 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref); | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
986 tprintf("pred_motion match_count=%d\n", match_count); |
| 1169 | 987 if(match_count > 1){ //most common |
| 988 *mx= mid_pred(A[0], B[0], C[0]); | |
| 989 *my= mid_pred(A[1], B[1], C[1]); | |
| 990 }else if(match_count==1){ | |
| 991 if(left_ref==ref){ | |
| 992 *mx= A[0]; | |
| 993 *my= A[1]; | |
| 994 }else if(top_ref==ref){ | |
| 995 *mx= B[0]; | |
| 996 *my= B[1]; | |
| 997 }else{ | |
| 998 *mx= C[0]; | |
| 999 *my= C[1]; | |
| 1000 } | |
| 1001 }else{ | |
| 1002 if(top_ref == PART_NOT_AVAILABLE && diagonal_ref == PART_NOT_AVAILABLE && left_ref != PART_NOT_AVAILABLE){ | |
| 1003 *mx= A[0]; | |
| 1004 *my= A[1]; | |
| 1168 | 1005 }else{ |
| 1006 *mx= mid_pred(A[0], B[0], C[0]); | |
| 1007 *my= mid_pred(A[1], B[1], C[1]); | |
| 1008 } | |
| 1169 | 1009 } |
| 1168 | 1010 |
| 1187 | 1011 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 | 1012 } |
| 1013 | |
| 1014 /** | |
| 1015 * gets the directionally predicted 16x8 MV. | |
| 1016 * @param n the block index | |
| 1017 * @param mx the x component of the predicted motion vector | |
| 1018 * @param my the y component of the predicted motion vector | |
| 1019 */ | |
| 1020 static inline void pred_16x8_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
| 1021 if(n==0){ | |
| 1022 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ]; | |
| 1023 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ]; | |
| 1024 | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1025 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 | 1026 |
| 1027 if(top_ref == ref){ | |
| 1028 *mx= B[0]; | |
| 1029 *my= B[1]; | |
| 1030 return; | |
| 1031 } | |
| 1032 }else{ | |
| 1033 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ]; | |
| 1034 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ]; | |
| 1035 | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1036 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 | 1037 |
| 1038 if(left_ref == ref){ | |
| 1039 *mx= A[0]; | |
| 1040 *my= A[1]; | |
| 1041 return; | |
| 1042 } | |
| 1043 } | |
| 1044 | |
| 1045 //RARE | |
| 1046 pred_motion(h, n, 4, list, ref, mx, my); | |
| 1047 } | |
| 1048 | |
| 1049 /** | |
| 1050 * gets the directionally predicted 8x16 MV. | |
| 1051 * @param n the block index | |
| 1052 * @param mx the x component of the predicted motion vector | |
| 1053 * @param my the y component of the predicted motion vector | |
| 1054 */ | |
| 1055 static inline void pred_8x16_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
| 1056 if(n==0){ | |
| 1057 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ]; | |
| 1058 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ]; | |
| 1059 | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1060 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 | 1061 |
| 1062 if(left_ref == ref){ | |
| 1063 *mx= A[0]; | |
| 1064 *my= A[1]; | |
| 1065 return; | |
| 1066 } | |
| 1067 }else{ | |
| 1169 | 1068 const int16_t * C; |
| 1069 int diagonal_ref; | |
| 1070 | |
| 1071 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2); | |
| 1168 | 1072 |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1073 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 | 1074 |
| 1169 | 1075 if(diagonal_ref == ref){ |
| 1168 | 1076 *mx= C[0]; |
| 1077 *my= C[1]; | |
| 1078 return; | |
| 1079 } | |
| 1080 } | |
| 1081 | |
| 1082 //RARE | |
| 1083 pred_motion(h, n, 2, list, ref, mx, my); | |
| 1084 } | |
| 1085 | |
| 1086 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){ | |
| 1087 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ]; | |
| 1088 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ]; | |
| 1089 | |
| 2392 | 1090 tprintf("pred_pskip: (%d) (%d) at %2d %2d\n", top_ref, left_ref, h->s.mb_x, h->s.mb_y); |
| 1168 | 1091 |
| 1092 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE | |
| 1093 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0) | |
| 1094 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){ | |
| 1095 | |
| 1096 *mx = *my = 0; | |
| 1097 return; | |
| 1098 } | |
| 1099 | |
| 1100 pred_motion(h, 0, 4, 0, 0, mx, my); | |
| 1101 | |
| 1102 return; | |
| 1103 } | |
| 1104 | |
| 2396 | 1105 static inline void direct_dist_scale_factor(H264Context * const h){ |
| 1106 const int poc = h->s.current_picture_ptr->poc; | |
| 1107 const int poc1 = h->ref_list[1][0].poc; | |
| 1108 int i; | |
| 1109 for(i=0; i<h->ref_count[0]; i++){ | |
| 1110 int poc0 = h->ref_list[0][i].poc; | |
| 1111 int td = clip(poc1 - poc0, -128, 127); | |
| 1112 if(td == 0 /* FIXME || pic0 is a long-term ref */){ | |
| 1113 h->dist_scale_factor[i] = 256; | |
| 1114 }else{ | |
| 1115 int tb = clip(poc - poc0, -128, 127); | |
| 1116 int tx = (16384 + (ABS(td) >> 1)) / td; | |
| 1117 h->dist_scale_factor[i] = clip((tb*tx + 32) >> 6, -1024, 1023); | |
| 1118 } | |
| 1119 } | |
| 1120 } | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1121 static inline void direct_ref_list_init(H264Context * const h){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1122 MpegEncContext * const s = &h->s; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1123 Picture * const ref1 = &h->ref_list[1][0]; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1124 Picture * const cur = s->current_picture_ptr; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1125 int list, i, j; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1126 if(cur->pict_type == I_TYPE) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1127 cur->ref_count[0] = 0; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1128 if(cur->pict_type != B_TYPE) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1129 cur->ref_count[1] = 0; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1130 for(list=0; list<2; list++){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1131 cur->ref_count[list] = h->ref_count[list]; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1132 for(j=0; j<h->ref_count[list]; j++) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1133 cur->ref_poc[list][j] = h->ref_list[list][j].poc; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1134 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1135 if(cur->pict_type != B_TYPE || h->direct_spatial_mv_pred) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1136 return; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1137 for(list=0; list<2; list++){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1138 for(i=0; i<ref1->ref_count[list]; i++){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1139 const int poc = ref1->ref_poc[list][i]; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1140 h->map_col_to_list0[list][i] = PART_NOT_AVAILABLE; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1141 for(j=0; j<h->ref_count[list]; j++) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1142 if(h->ref_list[list][j].poc == poc){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1143 h->map_col_to_list0[list][i] = j; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1144 break; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1145 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1146 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1147 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1148 } |
| 2396 | 1149 |
| 1150 static inline void pred_direct_motion(H264Context * const h, int *mb_type){ | |
| 1151 MpegEncContext * const s = &h->s; | |
| 1152 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; | |
| 1153 const int b8_xy = 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
| 1154 const int b4_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
| 1155 const int mb_type_col = h->ref_list[1][0].mb_type[mb_xy]; | |
| 1156 const int16_t (*l1mv0)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[0][b4_xy]; | |
| 1157 const int8_t *l1ref0 = &h->ref_list[1][0].ref_index[0][b8_xy]; | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1158 const int8_t *l1ref1 = &h->ref_list[1][0].ref_index[1][b8_xy]; |
| 2396 | 1159 const int is_b8x8 = IS_8X8(*mb_type); |
| 1160 int sub_mb_type; | |
| 1161 int i8, i4; | |
| 1162 | |
| 1163 if(IS_8X8(mb_type_col) && !h->sps.direct_8x8_inference_flag){ | |
| 1164 /* FIXME save sub mb types from previous frames (or derive from MVs) | |
| 1165 * so we know exactly what block size to use */ | |
| 1166 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */ | |
| 2536 | 1167 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
| 2396 | 1168 }else if(!is_b8x8 && (IS_16X16(mb_type_col) || IS_INTRA(mb_type_col))){ |
| 1169 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ | |
| 1170 *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */ | |
| 1171 }else{ | |
| 1172 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ | |
| 2536 | 1173 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
| 2396 | 1174 } |
| 1175 if(!is_b8x8) | |
| 1176 *mb_type |= MB_TYPE_DIRECT2; | |
| 1177 | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
1178 tprintf("mb_type = %08x, sub_mb_type = %08x, is_b8x8 = %d, mb_type_col = %08x\n", *mb_type, sub_mb_type, is_b8x8, mb_type_col); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
1179 |
| 2396 | 1180 if(h->direct_spatial_mv_pred){ |
| 1181 int ref[2]; | |
| 1182 int mv[2][2]; | |
| 1183 int list; | |
| 1184 | |
| 1185 /* ref = min(neighbors) */ | |
| 1186 for(list=0; list<2; list++){ | |
| 1187 int refa = h->ref_cache[list][scan8[0] - 1]; | |
| 1188 int refb = h->ref_cache[list][scan8[0] - 8]; | |
| 1189 int refc = h->ref_cache[list][scan8[0] - 8 + 4]; | |
| 1190 if(refc == -2) | |
| 1191 refc = h->ref_cache[list][scan8[0] - 8 - 1]; | |
| 1192 ref[list] = refa; | |
| 1193 if(ref[list] < 0 || (refb < ref[list] && refb >= 0)) | |
| 1194 ref[list] = refb; | |
| 1195 if(ref[list] < 0 || (refc < ref[list] && refc >= 0)) | |
| 1196 ref[list] = refc; | |
| 1197 if(ref[list] < 0) | |
| 1198 ref[list] = -1; | |
| 1199 } | |
| 1200 | |
| 1201 if(ref[0] < 0 && ref[1] < 0){ | |
| 1202 ref[0] = ref[1] = 0; | |
| 1203 mv[0][0] = mv[0][1] = | |
| 1204 mv[1][0] = mv[1][1] = 0; | |
| 1205 }else{ | |
| 1206 for(list=0; list<2; list++){ | |
| 1207 if(ref[list] >= 0) | |
| 1208 pred_motion(h, 0, 4, list, ref[list], &mv[list][0], &mv[list][1]); | |
| 1209 else | |
| 1210 mv[list][0] = mv[list][1] = 0; | |
| 1211 } | |
| 1212 } | |
| 1213 | |
| 1214 if(ref[1] < 0){ | |
| 1215 *mb_type &= ~MB_TYPE_P0L1; | |
| 1216 sub_mb_type &= ~MB_TYPE_P0L1; | |
| 1217 }else if(ref[0] < 0){ | |
| 1218 *mb_type &= ~MB_TYPE_P0L0; | |
| 1219 sub_mb_type &= ~MB_TYPE_P0L0; | |
| 1220 } | |
| 1221 | |
| 1222 if(IS_16X16(*mb_type)){ | |
| 1223 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref[0], 1); | |
| 1224 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, ref[1], 1); | |
| 1225 if(!IS_INTRA(mb_type_col) && l1ref0[0] == 0 && | |
| 1226 ABS(l1mv0[0][0]) <= 1 && ABS(l1mv0[0][1]) <= 1){ | |
| 1227 if(ref[0] > 0) | |
| 1228 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
| 1229 else | |
| 1230 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 1231 if(ref[1] > 0) | |
| 1232 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
| 1233 else | |
| 1234 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 1235 }else{ | |
| 1236 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
| 1237 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
| 1238 } | |
| 1239 }else{ | |
| 1240 for(i8=0; i8<4; i8++){ | |
| 1241 const int x8 = i8&1; | |
| 1242 const int y8 = i8>>1; | |
| 1243 | |
| 1244 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
| 1245 continue; | |
| 1246 h->sub_mb_type[i8] = sub_mb_type; | |
| 1247 | |
| 1248 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
| 1249 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
| 1250 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref[0], 1); | |
| 1251 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, ref[1], 1); | |
| 1252 | |
| 1253 /* col_zero_flag */ | |
| 1254 if(!IS_INTRA(mb_type_col) && l1ref0[x8 + y8*h->b8_stride] == 0){ | |
| 1255 for(i4=0; i4<4; i4++){ | |
| 1256 const int16_t *mv_col = l1mv0[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; | |
| 1257 if(ABS(mv_col[0]) <= 1 && ABS(mv_col[1]) <= 1){ | |
| 1258 if(ref[0] == 0) | |
| 1259 *(uint32_t*)h->mv_cache[0][scan8[i8*4+i4]] = 0; | |
| 1260 if(ref[1] == 0) | |
| 1261 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = 0; | |
| 1262 } | |
| 1263 } | |
| 1264 } | |
| 1265 } | |
| 1266 } | |
| 1267 }else{ /* direct temporal mv pred */ | |
| 1268 if(IS_16X16(*mb_type)){ | |
| 1269 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, 0, 1); | |
| 1270 if(IS_INTRA(mb_type_col)){ | |
| 1271 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
| 1272 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 1273 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 1274 }else{ | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1275 const int ref0 = l1ref0[0] >= 0 ? h->map_col_to_list0[0][l1ref0[0]] |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1276 : h->map_col_to_list0[1][l1ref1[0]]; |
| 2396 | 1277 const int dist_scale_factor = h->dist_scale_factor[ref0]; |
| 1278 const int16_t *mv_col = l1mv0[0]; | |
| 1279 int mv_l0[2]; | |
| 1280 mv_l0[0] = (dist_scale_factor * mv_col[0] + 128) >> 8; | |
| 1281 mv_l0[1] = (dist_scale_factor * mv_col[1] + 128) >> 8; | |
| 1282 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref0, 1); | |
| 1283 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv_l0[0],mv_l0[1]), 4); | |
| 1284 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); | |
| 1285 } | |
| 1286 }else{ | |
| 1287 for(i8=0; i8<4; i8++){ | |
| 1288 const int x8 = i8&1; | |
| 1289 const int y8 = i8>>1; | |
| 1290 int ref0, dist_scale_factor; | |
| 1291 | |
| 1292 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
| 1293 continue; | |
| 1294 h->sub_mb_type[i8] = sub_mb_type; | |
| 1295 if(IS_INTRA(mb_type_col)){ | |
| 1296 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1); | |
| 1297 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); | |
| 1298 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
| 1299 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
| 1300 continue; | |
| 1301 } | |
| 1302 | |
| 1303 ref0 = l1ref0[x8 + y8*h->b8_stride]; | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1304 if(ref0 >= 0) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1305 ref0 = h->map_col_to_list0[0][ref0]; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1306 else |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1307 ref0 = h->map_col_to_list0[1][l1ref1[x8 + y8*h->b8_stride]]; |
| 2396 | 1308 dist_scale_factor = h->dist_scale_factor[ref0]; |
| 1309 | |
| 1310 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1); | |
| 1311 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); | |
| 1312 for(i4=0; i4<4; i4++){ | |
| 1313 const int16_t *mv_col = l1mv0[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; | |
| 1314 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]]; | |
| 1315 mv_l0[0] = (dist_scale_factor * mv_col[0] + 128) >> 8; | |
| 1316 mv_l0[1] = (dist_scale_factor * mv_col[1] + 128) >> 8; | |
| 1317 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = | |
| 1318 pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]); | |
| 1319 } | |
| 1320 } | |
| 1321 } | |
| 1322 } | |
| 1323 } | |
| 1324 | |
| 1168 | 1325 static inline void write_back_motion(H264Context *h, int mb_type){ |
| 1326 MpegEncContext * const s = &h->s; | |
| 1327 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
| 1328 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
| 1329 int list; | |
| 1330 | |
| 1331 for(list=0; list<2; list++){ | |
| 1332 int y; | |
| 2535 | 1333 if(!USES_LIST(mb_type, list)){ |
| 1168 | 1334 if(1){ //FIXME skip or never read if mb_type doesnt use it |
| 1335 for(y=0; y<4; y++){ | |
| 1336 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]= | |
| 1337 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= 0; | |
| 1338 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1339 if( h->pps.cabac ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1340 /* FIXME needed ? */ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1341 for(y=0; y<4; y++){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1342 *(uint64_t*)h->mvd_table[list][b_xy + 0 + y*h->b_stride]= |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1343 *(uint64_t*)h->mvd_table[list][b_xy + 2 + y*h->b_stride]= 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1344 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1345 } |
| 1168 | 1346 for(y=0; y<2; y++){ |
|
2365
b76a4977447a
Fixed typo which caused incorrect motion prediction in B-frames. patch by (Loren Merritt <lorenm ta u tod washington tod edu>)
michael
parents:
2336
diff
changeset
|
1347 *(uint16_t*)&s->current_picture.ref_index[list][b8_xy + y*h->b8_stride]= (LIST_NOT_USED&0xFF)*0x0101; |
| 1168 | 1348 } |
| 1349 } | |
| 2396 | 1350 continue; |
| 1168 | 1351 } |
| 1352 | |
| 1353 for(y=0; y<4; y++){ | |
| 1354 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]= *(uint64_t*)h->mv_cache[list][scan8[0]+0 + 8*y]; | |
| 1355 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mv_cache[list][scan8[0]+2 + 8*y]; | |
| 1356 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1357 if( h->pps.cabac ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1358 for(y=0; y<4; y++){ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1359 *(uint64_t*)h->mvd_table[list][b_xy + 0 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+0 + 8*y]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1360 *(uint64_t*)h->mvd_table[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+2 + 8*y]; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1361 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1362 } |
| 1168 | 1363 for(y=0; y<2; y++){ |
| 1364 s->current_picture.ref_index[list][b8_xy + 0 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+0 + 16*y]; | |
| 1365 s->current_picture.ref_index[list][b8_xy + 1 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+2 + 16*y]; | |
| 1366 } | |
| 1367 } | |
| 2396 | 1368 |
| 1369 if(h->slice_type == B_TYPE && h->pps.cabac){ | |
| 1370 if(IS_8X8(mb_type)){ | |
| 1371 h->direct_table[b8_xy+1+0*h->b8_stride] = IS_DIRECT(h->sub_mb_type[1]) ? 1 : 0; | |
| 1372 h->direct_table[b8_xy+0+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[2]) ? 1 : 0; | |
| 1373 h->direct_table[b8_xy+1+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[3]) ? 1 : 0; | |
| 1374 } | |
| 1375 } | |
| 1168 | 1376 } |
| 1377 | |
| 1378 /** | |
| 1379 * Decodes a network abstraction layer unit. | |
| 1380 * @param consumed is the number of bytes used as input | |
| 1381 * @param length is the length of the array | |
| 1382 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp ttailing? | |
| 1383 * @returns decoded bytes, might be src+1 if no escapes | |
| 1384 */ | |
| 1385 static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *consumed, int length){ | |
| 1386 int i, si, di; | |
| 1387 uint8_t *dst; | |
| 1388 | |
| 1389 // src[0]&0x80; //forbidden bit | |
| 1390 h->nal_ref_idc= src[0]>>5; | |
| 1391 h->nal_unit_type= src[0]&0x1F; | |
| 1392 | |
| 1393 src++; length--; | |
| 1394 #if 0 | |
| 1395 for(i=0; i<length; i++) | |
| 1396 printf("%2X ", src[i]); | |
| 1397 #endif | |
| 1398 for(i=0; i+1<length; i+=2){ | |
| 1399 if(src[i]) continue; | |
| 1400 if(i>0 && src[i-1]==0) i--; | |
| 1401 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
| 1402 if(src[i+2]!=3){ | |
| 1403 /* startcode, so we must be past the end */ | |
| 1404 length=i; | |
| 1405 } | |
| 1406 break; | |
| 1407 } | |
| 1408 } | |
| 1409 | |
| 1410 if(i>=length-1){ //no escaped 0 | |
| 1411 *dst_length= length; | |
| 1412 *consumed= length+1; //+1 for the header | |
| 1413 return src; | |
| 1414 } | |
| 1415 | |
| 1416 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length); | |
| 1417 dst= h->rbsp_buffer; | |
| 1418 | |
| 1419 //printf("deoding esc\n"); | |
| 1420 si=di=0; | |
| 1421 while(si<length){ | |
| 1422 //remove escapes (very rare 1:2^22) | |
| 1423 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
| 1424 if(src[si+2]==3){ //escape | |
| 1425 dst[di++]= 0; | |
| 1426 dst[di++]= 0; | |
| 1427 si+=3; | |
|
1957
54411768fa38
h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1956
diff
changeset
|
1428 continue; |
| 1168 | 1429 }else //next start code |
| 1430 break; | |
| 1431 } | |
| 1432 | |
| 1433 dst[di++]= src[si++]; | |
| 1434 } | |
| 1435 | |
| 1436 *dst_length= di; | |
| 1437 *consumed= si + 1;//+1 for the header | |
| 1438 //FIXME store exact number of bits in the getbitcontext (its needed for decoding) | |
| 1439 return dst; | |
| 1440 } | |
| 1441 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1442 #if 0 |
| 1168 | 1443 /** |
| 1444 * @param src the data which should be escaped | |
| 1445 * @param dst the target buffer, dst+1 == src is allowed as a special case | |
| 1446 * @param length the length of the src data | |
| 1447 * @param dst_length the length of the dst array | |
| 1448 * @returns length of escaped data in bytes or -1 if an error occured | |
| 1449 */ | |
| 1450 static int encode_nal(H264Context *h, uint8_t *dst, uint8_t *src, int length, int dst_length){ | |
| 1451 int i, escape_count, si, di; | |
| 1452 uint8_t *temp; | |
| 1453 | |
| 1454 assert(length>=0); | |
| 1455 assert(dst_length>0); | |
| 1456 | |
| 1457 dst[0]= (h->nal_ref_idc<<5) + h->nal_unit_type; | |
| 1458 | |
| 1459 if(length==0) return 1; | |
| 1460 | |
| 1461 escape_count= 0; | |
| 1462 for(i=0; i<length; i+=2){ | |
| 1463 if(src[i]) continue; | |
| 1464 if(i>0 && src[i-1]==0) | |
| 1465 i--; | |
| 1466 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
| 1467 escape_count++; | |
| 1468 i+=2; | |
| 1469 } | |
| 1470 } | |
| 1471 | |
| 1472 if(escape_count==0){ | |
| 1473 if(dst+1 != src) | |
| 1474 memcpy(dst+1, src, length); | |
| 1475 return length + 1; | |
| 1476 } | |
| 1477 | |
| 1478 if(length + escape_count + 1> dst_length) | |
| 1479 return -1; | |
| 1480 | |
| 1481 //this should be damn rare (hopefully) | |
| 1482 | |
| 1483 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length + escape_count); | |
| 1484 temp= h->rbsp_buffer; | |
| 1485 //printf("encoding esc\n"); | |
| 1486 | |
| 1487 si= 0; | |
| 1488 di= 0; | |
| 1489 while(si < length){ | |
| 1490 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
| 1491 temp[di++]= 0; si++; | |
| 1492 temp[di++]= 0; si++; | |
| 1493 temp[di++]= 3; | |
| 1494 temp[di++]= src[si++]; | |
| 1495 } | |
| 1496 else | |
| 1497 temp[di++]= src[si++]; | |
| 1498 } | |
| 1499 memcpy(dst+1, temp, length+escape_count); | |
| 1500 | |
| 1501 assert(di == length+escape_count); | |
| 1502 | |
| 1503 return di + 1; | |
| 1504 } | |
| 1505 | |
| 1506 /** | |
| 1507 * write 1,10,100,1000,... for alignment, yes its exactly inverse to mpeg4 | |
| 1508 */ | |
| 1509 static void encode_rbsp_trailing(PutBitContext *pb){ | |
| 1510 int length; | |
| 1511 put_bits(pb, 1, 1); | |
| 1786 | 1512 length= (-put_bits_count(pb))&7; |
| 1168 | 1513 if(length) put_bits(pb, length, 0); |
| 1514 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1515 #endif |
| 1168 | 1516 |
| 1517 /** | |
| 1518 * identifies the exact end of the bitstream | |
| 1519 * @return the length of the trailing, or 0 if damaged | |
| 1520 */ | |
| 1521 static int decode_rbsp_trailing(uint8_t *src){ | |
| 1522 int v= *src; | |
| 1523 int r; | |
| 1524 | |
| 1170 | 1525 tprintf("rbsp trailing %X\n", v); |
| 1168 | 1526 |
| 1527 for(r=1; r<9; r++){ | |
| 1528 if(v&1) return r; | |
| 1529 v>>=1; | |
| 1530 } | |
| 1531 return 0; | |
| 1532 } | |
| 1533 | |
| 1534 /** | |
| 1535 * idct tranforms the 16 dc values and dequantize them. | |
| 1536 * @param qp quantization parameter | |
| 1537 */ | |
| 1538 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
| 1539 const int qmul= dequant_coeff[qp][0]; | |
| 1540 #define stride 16 | |
| 1541 int i; | |
| 1542 int temp[16]; //FIXME check if this is a good idea | |
| 1543 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
| 1544 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
| 1545 | |
| 1546 //memset(block, 64, 2*256); | |
| 1547 //return; | |
| 1548 for(i=0; i<4; i++){ | |
| 1549 const int offset= y_offset[i]; | |
| 1550 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
| 1551 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
| 1552 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
| 1553 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
| 1554 | |
| 1555 temp[4*i+0]= z0+z3; | |
| 1556 temp[4*i+1]= z1+z2; | |
| 1557 temp[4*i+2]= z1-z2; | |
| 1558 temp[4*i+3]= z0-z3; | |
| 1559 } | |
| 1560 | |
| 1561 for(i=0; i<4; i++){ | |
| 1562 const int offset= x_offset[i]; | |
| 1563 const int z0= temp[4*0+i] + temp[4*2+i]; | |
| 1564 const int z1= temp[4*0+i] - temp[4*2+i]; | |
| 1565 const int z2= temp[4*1+i] - temp[4*3+i]; | |
| 1566 const int z3= temp[4*1+i] + temp[4*3+i]; | |
| 1567 | |
| 1568 block[stride*0 +offset]= ((z0 + z3)*qmul + 2)>>2; //FIXME think about merging this into decode_resdual | |
| 1569 block[stride*2 +offset]= ((z1 + z2)*qmul + 2)>>2; | |
| 1570 block[stride*8 +offset]= ((z1 - z2)*qmul + 2)>>2; | |
| 1571 block[stride*10+offset]= ((z0 - z3)*qmul + 2)>>2; | |
| 1572 } | |
| 1573 } | |
| 1574 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1575 #if 0 |
| 1168 | 1576 /** |
| 1577 * dct tranforms the 16 dc values. | |
| 1578 * @param qp quantization parameter ??? FIXME | |
| 1579 */ | |
| 1580 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){ | |
| 1581 // const int qmul= dequant_coeff[qp][0]; | |
| 1582 int i; | |
| 1583 int temp[16]; //FIXME check if this is a good idea | |
| 1584 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
| 1585 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
| 1586 | |
| 1587 for(i=0; i<4; i++){ | |
| 1588 const int offset= y_offset[i]; | |
| 1589 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
| 1590 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
| 1591 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
| 1592 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
| 1593 | |
| 1594 temp[4*i+0]= z0+z3; | |
| 1595 temp[4*i+1]= z1+z2; | |
| 1596 temp[4*i+2]= z1-z2; | |
| 1597 temp[4*i+3]= z0-z3; | |
| 1598 } | |
| 1599 | |
| 1600 for(i=0; i<4; i++){ | |
| 1601 const int offset= x_offset[i]; | |
| 1602 const int z0= temp[4*0+i] + temp[4*2+i]; | |
| 1603 const int z1= temp[4*0+i] - temp[4*2+i]; | |
| 1604 const int z2= temp[4*1+i] - temp[4*3+i]; | |
| 1605 const int z3= temp[4*1+i] + temp[4*3+i]; | |
| 1606 | |
| 1607 block[stride*0 +offset]= (z0 + z3)>>1; | |
| 1608 block[stride*2 +offset]= (z1 + z2)>>1; | |
| 1609 block[stride*8 +offset]= (z1 - z2)>>1; | |
| 1610 block[stride*10+offset]= (z0 - z3)>>1; | |
| 1611 } | |
| 1612 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1613 #endif |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1614 |
| 1168 | 1615 #undef xStride |
| 1616 #undef stride | |
| 1617 | |
| 1618 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
| 1619 const int qmul= dequant_coeff[qp][0]; | |
| 1620 const int stride= 16*2; | |
| 1621 const int xStride= 16; | |
| 1622 int a,b,c,d,e; | |
| 1623 | |
| 1624 a= block[stride*0 + xStride*0]; | |
| 1625 b= block[stride*0 + xStride*1]; | |
| 1626 c= block[stride*1 + xStride*0]; | |
| 1627 d= block[stride*1 + xStride*1]; | |
| 1628 | |
| 1629 e= a-b; | |
| 1630 a= a+b; | |
| 1631 b= c-d; | |
| 1632 c= c+d; | |
| 1633 | |
| 1634 block[stride*0 + xStride*0]= ((a+c)*qmul + 0)>>1; | |
| 1635 block[stride*0 + xStride*1]= ((e+b)*qmul + 0)>>1; | |
| 1636 block[stride*1 + xStride*0]= ((a-c)*qmul + 0)>>1; | |
| 1637 block[stride*1 + xStride*1]= ((e-b)*qmul + 0)>>1; | |
| 1638 } | |
| 1639 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1640 #if 0 |
| 1168 | 1641 static void chroma_dc_dct_c(DCTELEM *block){ |
| 1642 const int stride= 16*2; | |
| 1643 const int xStride= 16; | |
| 1644 int a,b,c,d,e; | |
| 1645 | |
| 1646 a= block[stride*0 + xStride*0]; | |
| 1647 b= block[stride*0 + xStride*1]; | |
| 1648 c= block[stride*1 + xStride*0]; | |
| 1649 d= block[stride*1 + xStride*1]; | |
| 1650 | |
| 1651 e= a-b; | |
| 1652 a= a+b; | |
| 1653 b= c-d; | |
| 1654 c= c+d; | |
| 1655 | |
| 1656 block[stride*0 + xStride*0]= (a+c); | |
| 1657 block[stride*0 + xStride*1]= (e+b); | |
| 1658 block[stride*1 + xStride*0]= (a-c); | |
| 1659 block[stride*1 + xStride*1]= (e-b); | |
| 1660 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1661 #endif |
| 1168 | 1662 |
| 1663 /** | |
| 1664 * gets the chroma qp. | |
| 1665 */ | |
| 1666 static inline int get_chroma_qp(H264Context *h, int qscale){ | |
| 1667 | |
| 1668 return chroma_qp[clip(qscale + h->pps.chroma_qp_index_offset, 0, 51)]; | |
| 1669 } | |
| 1670 | |
| 1671 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1672 #if 0 |
| 1168 | 1673 static void h264_diff_dct_c(DCTELEM *block, uint8_t *src1, uint8_t *src2, int stride){ |
| 1674 int i; | |
| 1675 //FIXME try int temp instead of block | |
| 1676 | |
| 1677 for(i=0; i<4; i++){ | |
| 1678 const int d0= src1[0 + i*stride] - src2[0 + i*stride]; | |
| 1679 const int d1= src1[1 + i*stride] - src2[1 + i*stride]; | |
| 1680 const int d2= src1[2 + i*stride] - src2[2 + i*stride]; | |
| 1681 const int d3= src1[3 + i*stride] - src2[3 + i*stride]; | |
| 1682 const int z0= d0 + d3; | |
| 1683 const int z3= d0 - d3; | |
| 1684 const int z1= d1 + d2; | |
| 1685 const int z2= d1 - d2; | |
| 1686 | |
| 1687 block[0 + 4*i]= z0 + z1; | |
| 1688 block[1 + 4*i]= 2*z3 + z2; | |
| 1689 block[2 + 4*i]= z0 - z1; | |
| 1690 block[3 + 4*i]= z3 - 2*z2; | |
| 1691 } | |
| 1692 | |
| 1693 for(i=0; i<4; i++){ | |
| 1694 const int z0= block[0*4 + i] + block[3*4 + i]; | |
| 1695 const int z3= block[0*4 + i] - block[3*4 + i]; | |
| 1696 const int z1= block[1*4 + i] + block[2*4 + i]; | |
| 1697 const int z2= block[1*4 + i] - block[2*4 + i]; | |
| 1698 | |
| 1699 block[0*4 + i]= z0 + z1; | |
| 1700 block[1*4 + i]= 2*z3 + z2; | |
| 1701 block[2*4 + i]= z0 - z1; | |
| 1702 block[3*4 + i]= z3 - 2*z2; | |
| 1703 } | |
| 1704 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1705 #endif |
| 1168 | 1706 |
| 1707 //FIXME need to check that this doesnt overflow signed 32 bit for low qp, iam not sure, its very close | |
| 1708 //FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away) | |
| 1709 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int seperate_dc){ | |
| 1710 int i; | |
| 1711 const int * const quant_table= quant_coeff[qscale]; | |
| 1712 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6; | |
| 1713 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1; | |
| 1714 const unsigned int threshold2= (threshold1<<1); | |
| 1715 int last_non_zero; | |
| 1716 | |
| 1717 if(seperate_dc){ | |
| 1718 if(qscale<=18){ | |
| 1719 //avoid overflows | |
| 1720 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6; | |
| 1721 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1; | |
| 1722 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
| 1723 | |
| 1724 int level= block[0]*quant_coeff[qscale+18][0]; | |
| 1725 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
| 1726 if(level>0){ | |
| 1727 level= (dc_bias + level)>>(QUANT_SHIFT-2); | |
| 1728 block[0]= level; | |
| 1729 }else{ | |
| 1730 level= (dc_bias - level)>>(QUANT_SHIFT-2); | |
| 1731 block[0]= -level; | |
| 1732 } | |
| 1733 // last_non_zero = i; | |
| 1734 }else{ | |
| 1735 block[0]=0; | |
| 1736 } | |
| 1737 }else{ | |
| 1738 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6; | |
| 1739 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1; | |
| 1740 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
| 1741 | |
| 1742 int level= block[0]*quant_table[0]; | |
| 1743 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
| 1744 if(level>0){ | |
| 1745 level= (dc_bias + level)>>(QUANT_SHIFT+1); | |
| 1746 block[0]= level; | |
| 1747 }else{ | |
| 1748 level= (dc_bias - level)>>(QUANT_SHIFT+1); | |
| 1749 block[0]= -level; | |
| 1750 } | |
| 1751 // last_non_zero = i; | |
| 1752 }else{ | |
| 1753 block[0]=0; | |
| 1754 } | |
| 1755 } | |
| 1756 last_non_zero= 0; | |
| 1757 i=1; | |
| 1758 }else{ | |
| 1759 last_non_zero= -1; | |
| 1760 i=0; | |
| 1761 } | |
| 1762 | |
| 1763 for(; i<16; i++){ | |
| 1764 const int j= scantable[i]; | |
| 1765 int level= block[j]*quant_table[j]; | |
| 1766 | |
| 1767 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
| 1768 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
| 1769 if(((unsigned)(level+threshold1))>threshold2){ | |
| 1770 if(level>0){ | |
| 1771 level= (bias + level)>>QUANT_SHIFT; | |
| 1772 block[j]= level; | |
| 1773 }else{ | |
| 1774 level= (bias - level)>>QUANT_SHIFT; | |
| 1775 block[j]= -level; | |
| 1776 } | |
| 1777 last_non_zero = i; | |
| 1778 }else{ | |
| 1779 block[j]=0; | |
| 1780 } | |
| 1781 } | |
| 1782 | |
| 1783 return last_non_zero; | |
| 1784 } | |
| 1785 | |
| 1786 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1787 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 1788 ((uint32_t*)(src+0*stride))[0]= a; | |
| 1789 ((uint32_t*)(src+1*stride))[0]= a; | |
| 1790 ((uint32_t*)(src+2*stride))[0]= a; | |
| 1791 ((uint32_t*)(src+3*stride))[0]= a; | |
| 1792 } | |
| 1793 | |
| 1794 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1795 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101; | |
| 1796 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101; | |
| 1797 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101; | |
| 1798 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101; | |
| 1799 } | |
| 1800 | |
| 1801 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1802 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] | |
| 1803 + src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 4) >>3; | |
| 1804 | |
| 1805 ((uint32_t*)(src+0*stride))[0]= | |
| 1806 ((uint32_t*)(src+1*stride))[0]= | |
| 1807 ((uint32_t*)(src+2*stride))[0]= | |
| 1808 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1809 } | |
| 1810 | |
| 1811 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1812 const int dc= ( src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 2) >>2; | |
| 1813 | |
| 1814 ((uint32_t*)(src+0*stride))[0]= | |
| 1815 ((uint32_t*)(src+1*stride))[0]= | |
| 1816 ((uint32_t*)(src+2*stride))[0]= | |
| 1817 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1818 } | |
| 1819 | |
| 1820 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1821 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2; | |
| 1822 | |
| 1823 ((uint32_t*)(src+0*stride))[0]= | |
| 1824 ((uint32_t*)(src+1*stride))[0]= | |
| 1825 ((uint32_t*)(src+2*stride))[0]= | |
| 1826 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1827 } | |
| 1828 | |
| 1829 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1830 ((uint32_t*)(src+0*stride))[0]= | |
| 1831 ((uint32_t*)(src+1*stride))[0]= | |
| 1832 ((uint32_t*)(src+2*stride))[0]= | |
| 1833 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U; | |
| 1834 } | |
| 1835 | |
| 1836 | |
| 1837 #define LOAD_TOP_RIGHT_EDGE\ | |
| 1838 const int t4= topright[0];\ | |
| 1839 const int t5= topright[1];\ | |
| 1840 const int t6= topright[2];\ | |
| 1841 const int t7= topright[3];\ | |
| 1842 | |
| 1843 #define LOAD_LEFT_EDGE\ | |
| 1844 const int l0= src[-1+0*stride];\ | |
| 1845 const int l1= src[-1+1*stride];\ | |
| 1846 const int l2= src[-1+2*stride];\ | |
| 1847 const int l3= src[-1+3*stride];\ | |
| 1848 | |
| 1849 #define LOAD_TOP_EDGE\ | |
| 1850 const int t0= src[ 0-1*stride];\ | |
| 1851 const int t1= src[ 1-1*stride];\ | |
| 1852 const int t2= src[ 2-1*stride];\ | |
| 1853 const int t3= src[ 3-1*stride];\ | |
| 1854 | |
| 1855 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1856 const int lt= src[-1-1*stride]; | |
| 1857 LOAD_TOP_EDGE | |
| 1858 LOAD_LEFT_EDGE | |
| 1859 | |
| 1860 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2; | |
| 1861 src[0+2*stride]= | |
| 1862 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2; | |
| 1863 src[0+1*stride]= | |
| 1864 src[1+2*stride]= | |
| 1865 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2; | |
| 1866 src[0+0*stride]= | |
| 1867 src[1+1*stride]= | |
| 1868 src[2+2*stride]= | |
| 1869 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1870 src[1+0*stride]= | |
| 1871 src[2+1*stride]= | |
| 1872 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1873 src[2+0*stride]= | |
| 1874 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1875 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1282 | 1876 } |
| 1168 | 1877 |
| 1878 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1879 LOAD_TOP_EDGE | |
| 1880 LOAD_TOP_RIGHT_EDGE | |
| 1881 // LOAD_LEFT_EDGE | |
| 1882 | |
| 1883 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2; | |
| 1884 src[1+0*stride]= | |
| 1885 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2; | |
| 1886 src[2+0*stride]= | |
| 1887 src[1+1*stride]= | |
| 1888 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2; | |
| 1889 src[3+0*stride]= | |
| 1890 src[2+1*stride]= | |
| 1891 src[1+2*stride]= | |
| 1892 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2; | |
| 1893 src[3+1*stride]= | |
| 1894 src[2+2*stride]= | |
| 1895 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2; | |
| 1896 src[3+2*stride]= | |
| 1897 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2; | |
| 1898 src[3+3*stride]=(t6 + 3*t7 + 2)>>2; | |
| 1282 | 1899 } |
| 1168 | 1900 |
| 1901 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1902 const int lt= src[-1-1*stride]; | |
| 1903 LOAD_TOP_EDGE | |
| 1904 LOAD_LEFT_EDGE | |
| 1905 const __attribute__((unused)) int unu= l3; | |
| 1906 | |
| 1907 src[0+0*stride]= | |
| 1908 src[1+2*stride]=(lt + t0 + 1)>>1; | |
| 1909 src[1+0*stride]= | |
| 1910 src[2+2*stride]=(t0 + t1 + 1)>>1; | |
| 1911 src[2+0*stride]= | |
| 1912 src[3+2*stride]=(t1 + t2 + 1)>>1; | |
| 1913 src[3+0*stride]=(t2 + t3 + 1)>>1; | |
| 1914 src[0+1*stride]= | |
| 1915 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1916 src[1+1*stride]= | |
| 1917 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1918 src[2+1*stride]= | |
| 1919 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1920 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1921 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
| 1922 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1282 | 1923 } |
| 1168 | 1924 |
| 1925 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1926 LOAD_TOP_EDGE | |
| 1927 LOAD_TOP_RIGHT_EDGE | |
| 1928 const __attribute__((unused)) int unu= t7; | |
| 1929 | |
| 1930 src[0+0*stride]=(t0 + t1 + 1)>>1; | |
| 1931 src[1+0*stride]= | |
| 1932 src[0+2*stride]=(t1 + t2 + 1)>>1; | |
| 1933 src[2+0*stride]= | |
| 1934 src[1+2*stride]=(t2 + t3 + 1)>>1; | |
| 1935 src[3+0*stride]= | |
| 1936 src[2+2*stride]=(t3 + t4+ 1)>>1; | |
| 1937 src[3+2*stride]=(t4 + t5+ 1)>>1; | |
| 1938 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1939 src[1+1*stride]= | |
| 1940 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1941 src[2+1*stride]= | |
| 1942 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2; | |
| 1943 src[3+1*stride]= | |
| 1944 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; | |
| 1945 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; | |
| 1282 | 1946 } |
| 1168 | 1947 |
| 1948 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1949 LOAD_LEFT_EDGE | |
| 1950 | |
| 1951 src[0+0*stride]=(l0 + l1 + 1)>>1; | |
| 1952 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1953 src[2+0*stride]= | |
| 1954 src[0+1*stride]=(l1 + l2 + 1)>>1; | |
| 1955 src[3+0*stride]= | |
| 1956 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
| 1957 src[2+1*stride]= | |
| 1958 src[0+2*stride]=(l2 + l3 + 1)>>1; | |
| 1959 src[3+1*stride]= | |
| 1960 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2; | |
| 1961 src[3+2*stride]= | |
| 1962 src[1+3*stride]= | |
| 1963 src[0+3*stride]= | |
| 1964 src[2+2*stride]= | |
| 1965 src[2+3*stride]= | |
| 1966 src[3+3*stride]=l3; | |
| 1282 | 1967 } |
| 1168 | 1968 |
| 1969 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1970 const int lt= src[-1-1*stride]; | |
| 1971 LOAD_TOP_EDGE | |
| 1972 LOAD_LEFT_EDGE | |
| 1973 const __attribute__((unused)) int unu= t3; | |
| 1974 | |
| 1975 src[0+0*stride]= | |
| 1976 src[2+1*stride]=(lt + l0 + 1)>>1; | |
| 1977 src[1+0*stride]= | |
| 1978 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1979 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1980 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1981 src[0+1*stride]= | |
| 1982 src[2+2*stride]=(l0 + l1 + 1)>>1; | |
| 1983 src[1+1*stride]= | |
| 1984 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
| 1985 src[0+2*stride]= | |
| 1986 src[2+3*stride]=(l1 + l2+ 1)>>1; | |
| 1987 src[1+2*stride]= | |
| 1988 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1989 src[0+3*stride]=(l2 + l3 + 1)>>1; | |
| 1990 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
| 1282 | 1991 } |
| 1168 | 1992 |
| 1993 static void pred16x16_vertical_c(uint8_t *src, int stride){ | |
| 1994 int i; | |
| 1995 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 1996 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
| 1997 const uint32_t c= ((uint32_t*)(src-stride))[2]; | |
| 1998 const uint32_t d= ((uint32_t*)(src-stride))[3]; | |
| 1999 | |
| 2000 for(i=0; i<16; i++){ | |
| 2001 ((uint32_t*)(src+i*stride))[0]= a; | |
| 2002 ((uint32_t*)(src+i*stride))[1]= b; | |
| 2003 ((uint32_t*)(src+i*stride))[2]= c; | |
| 2004 ((uint32_t*)(src+i*stride))[3]= d; | |
| 2005 } | |
| 2006 } | |
| 2007 | |
| 2008 static void pred16x16_horizontal_c(uint8_t *src, int stride){ | |
| 2009 int i; | |
| 2010 | |
| 2011 for(i=0; i<16; i++){ | |
| 2012 ((uint32_t*)(src+i*stride))[0]= | |
| 2013 ((uint32_t*)(src+i*stride))[1]= | |
| 2014 ((uint32_t*)(src+i*stride))[2]= | |
| 2015 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101; | |
| 2016 } | |
| 2017 } | |
| 2018 | |
| 2019 static void pred16x16_dc_c(uint8_t *src, int stride){ | |
| 2020 int i, dc=0; | |
| 2021 | |
| 2022 for(i=0;i<16; i++){ | |
| 2023 dc+= src[-1+i*stride]; | |
| 2024 } | |
| 2025 | |
| 2026 for(i=0;i<16; i++){ | |
| 2027 dc+= src[i-stride]; | |
| 2028 } | |
| 2029 | |
| 2030 dc= 0x01010101*((dc + 16)>>5); | |
| 2031 | |
| 2032 for(i=0; i<16; i++){ | |
| 2033 ((uint32_t*)(src+i*stride))[0]= | |
| 2034 ((uint32_t*)(src+i*stride))[1]= | |
| 2035 ((uint32_t*)(src+i*stride))[2]= | |
| 2036 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 2037 } | |
| 2038 } | |
| 2039 | |
| 2040 static void pred16x16_left_dc_c(uint8_t *src, int stride){ | |
| 2041 int i, dc=0; | |
| 2042 | |
| 2043 for(i=0;i<16; i++){ | |
| 2044 dc+= src[-1+i*stride]; | |
| 2045 } | |
| 2046 | |
| 2047 dc= 0x01010101*((dc + 8)>>4); | |
| 2048 | |
| 2049 for(i=0; i<16; i++){ | |
| 2050 ((uint32_t*)(src+i*stride))[0]= | |
| 2051 ((uint32_t*)(src+i*stride))[1]= | |
| 2052 ((uint32_t*)(src+i*stride))[2]= | |
| 2053 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 2054 } | |
| 2055 } | |
| 2056 | |
| 2057 static void pred16x16_top_dc_c(uint8_t *src, int stride){ | |
| 2058 int i, dc=0; | |
| 2059 | |
| 2060 for(i=0;i<16; i++){ | |
| 2061 dc+= src[i-stride]; | |
| 2062 } | |
| 2063 dc= 0x01010101*((dc + 8)>>4); | |
| 2064 | |
| 2065 for(i=0; i<16; i++){ | |
| 2066 ((uint32_t*)(src+i*stride))[0]= | |
| 2067 ((uint32_t*)(src+i*stride))[1]= | |
| 2068 ((uint32_t*)(src+i*stride))[2]= | |
| 2069 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 2070 } | |
| 2071 } | |
| 2072 | |
| 2073 static void pred16x16_128_dc_c(uint8_t *src, int stride){ | |
| 2074 int i; | |
| 2075 | |
| 2076 for(i=0; i<16; i++){ | |
| 2077 ((uint32_t*)(src+i*stride))[0]= | |
| 2078 ((uint32_t*)(src+i*stride))[1]= | |
| 2079 ((uint32_t*)(src+i*stride))[2]= | |
| 2080 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U; | |
| 2081 } | |
| 2082 } | |
| 2083 | |
| 1234 | 2084 static inline void pred16x16_plane_compat_c(uint8_t *src, int stride, const int svq3){ |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2085 int i, j, k; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2086 int a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2087 uint8_t *cm = cropTbl + MAX_NEG_CROP; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2088 const uint8_t * const src0 = src+7-stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2089 const uint8_t *src1 = src+8*stride-1; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2090 const uint8_t *src2 = src1-2*stride; // == src+6*stride-1; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2091 int H = src0[1] - src0[-1]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2092 int V = src1[0] - src2[ 0]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2093 for(k=2; k<=8; ++k) { |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2094 src1 += stride; src2 -= stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2095 H += k*(src0[k] - src0[-k]); |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2096 V += k*(src1[0] - src2[ 0]); |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2097 } |
| 1234 | 2098 if(svq3){ |
| 2099 H = ( 5*(H/4) ) / 16; | |
| 2100 V = ( 5*(V/4) ) / 16; | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2101 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2102 /* required for 100% accuracy */ |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2103 i = H; H = V; V = i; |
| 1234 | 2104 }else{ |
| 2105 H = ( 5*H+32 ) >> 6; | |
| 2106 V = ( 5*V+32 ) >> 6; | |
| 2107 } | |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2108 |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2109 a = 16*(src1[0] + src2[16] + 1) - 7*(V+H); |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2110 for(j=16; j>0; --j) { |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2111 int b = a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2112 a += V; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2113 for(i=-16; i<0; i+=4) { |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2114 src[16+i] = cm[ (b ) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2115 src[17+i] = cm[ (b+ H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2116 src[18+i] = cm[ (b+2*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2117 src[19+i] = cm[ (b+3*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2118 b += 4*H; |
| 1168 | 2119 } |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2120 src += stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2121 } |
| 1168 | 2122 } |
| 2123 | |
| 1234 | 2124 static void pred16x16_plane_c(uint8_t *src, int stride){ |
| 2125 pred16x16_plane_compat_c(src, stride, 0); | |
| 2126 } | |
| 2127 | |
| 1168 | 2128 static void pred8x8_vertical_c(uint8_t *src, int stride){ |
| 2129 int i; | |
| 2130 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 2131 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
| 2132 | |
| 2133 for(i=0; i<8; i++){ | |
| 2134 ((uint32_t*)(src+i*stride))[0]= a; | |
| 2135 ((uint32_t*)(src+i*stride))[1]= b; | |
| 2136 } | |
| 2137 } | |
| 2138 | |
| 2139 static void pred8x8_horizontal_c(uint8_t *src, int stride){ | |
| 2140 int i; | |
| 2141 | |
| 2142 for(i=0; i<8; i++){ | |
| 2143 ((uint32_t*)(src+i*stride))[0]= | |
| 2144 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101; | |
| 2145 } | |
| 2146 } | |
| 2147 | |
| 2148 static void pred8x8_128_dc_c(uint8_t *src, int stride){ | |
| 2149 int i; | |
| 2150 | |
| 2151 for(i=0; i<4; i++){ | |
| 2152 ((uint32_t*)(src+i*stride))[0]= | |
| 2153 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; | |
| 2154 } | |
| 2155 for(i=4; i<8; i++){ | |
| 2156 ((uint32_t*)(src+i*stride))[0]= | |
| 2157 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; | |
| 2158 } | |
| 2159 } | |
| 2160 | |
| 2161 static void pred8x8_left_dc_c(uint8_t *src, int stride){ | |
| 2162 int i; | |
| 2163 int dc0, dc2; | |
| 2164 | |
| 2165 dc0=dc2=0; | |
| 2166 for(i=0;i<4; i++){ | |
| 2167 dc0+= src[-1+i*stride]; | |
| 2168 dc2+= src[-1+(i+4)*stride]; | |
| 2169 } | |
| 2170 dc0= 0x01010101*((dc0 + 2)>>2); | |
| 2171 dc2= 0x01010101*((dc2 + 2)>>2); | |
| 2172 | |
| 2173 for(i=0; i<4; i++){ | |
| 2174 ((uint32_t*)(src+i*stride))[0]= | |
| 2175 ((uint32_t*)(src+i*stride))[1]= dc0; | |
| 2176 } | |
| 2177 for(i=4; i<8; i++){ | |
| 2178 ((uint32_t*)(src+i*stride))[0]= | |
| 2179 ((uint32_t*)(src+i*stride))[1]= dc2; | |
| 2180 } | |
| 2181 } | |
| 2182 | |
| 2183 static void pred8x8_top_dc_c(uint8_t *src, int stride){ | |
| 2184 int i; | |
| 2185 int dc0, dc1; | |
| 2186 | |
| 2187 dc0=dc1=0; | |
| 2188 for(i=0;i<4; i++){ | |
| 2189 dc0+= src[i-stride]; | |
| 2190 dc1+= src[4+i-stride]; | |
| 2191 } | |
| 2192 dc0= 0x01010101*((dc0 + 2)>>2); | |
| 2193 dc1= 0x01010101*((dc1 + 2)>>2); | |
| 2194 | |
| 2195 for(i=0; i<4; i++){ | |
| 2196 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2197 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2198 } | |
| 2199 for(i=4; i<8; i++){ | |
| 2200 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2201 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2202 } | |
| 2203 } | |
| 2204 | |
| 2205 | |
| 2206 static void pred8x8_dc_c(uint8_t *src, int stride){ | |
| 2207 int i; | |
| 2208 int dc0, dc1, dc2, dc3; | |
| 2209 | |
| 2210 dc0=dc1=dc2=0; | |
| 2211 for(i=0;i<4; i++){ | |
| 2212 dc0+= src[-1+i*stride] + src[i-stride]; | |
| 2213 dc1+= src[4+i-stride]; | |
| 2214 dc2+= src[-1+(i+4)*stride]; | |
| 2215 } | |
| 2216 dc3= 0x01010101*((dc1 + dc2 + 4)>>3); | |
| 2217 dc0= 0x01010101*((dc0 + 4)>>3); | |
| 2218 dc1= 0x01010101*((dc1 + 2)>>2); | |
| 2219 dc2= 0x01010101*((dc2 + 2)>>2); | |
| 2220 | |
| 2221 for(i=0; i<4; i++){ | |
| 2222 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2223 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2224 } | |
| 2225 for(i=4; i<8; i++){ | |
| 2226 ((uint32_t*)(src+i*stride))[0]= dc2; | |
| 2227 ((uint32_t*)(src+i*stride))[1]= dc3; | |
| 2228 } | |
| 2229 } | |
| 2230 | |
| 2231 static void pred8x8_plane_c(uint8_t *src, int stride){ | |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2232 int j, k; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2233 int a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2234 uint8_t *cm = cropTbl + MAX_NEG_CROP; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2235 const uint8_t * const src0 = src+3-stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2236 const uint8_t *src1 = src+4*stride-1; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2237 const uint8_t *src2 = src1-2*stride; // == src+2*stride-1; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2238 int H = src0[1] - src0[-1]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2239 int V = src1[0] - src2[ 0]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2240 for(k=2; k<=4; ++k) { |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2241 src1 += stride; src2 -= stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2242 H += k*(src0[k] - src0[-k]); |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2243 V += k*(src1[0] - src2[ 0]); |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2244 } |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2245 H = ( 17*H+16 ) >> 5; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2246 V = ( 17*V+16 ) >> 5; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2247 |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2248 a = 16*(src1[0] + src2[8]+1) - 3*(V+H); |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2249 for(j=8; j>0; --j) { |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2250 int b = a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2251 a += V; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2252 src[0] = cm[ (b ) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2253 src[1] = cm[ (b+ H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2254 src[2] = cm[ (b+2*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2255 src[3] = cm[ (b+3*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2256 src[4] = cm[ (b+4*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2257 src[5] = cm[ (b+5*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2258 src[6] = cm[ (b+6*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2259 src[7] = cm[ (b+7*H) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2260 src += stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2261 } |
| 1168 | 2262 } |
| 2263 | |
| 2264 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list, | |
| 2265 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2266 int src_x_offset, int src_y_offset, | |
| 2267 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){ | |
| 2268 MpegEncContext * const s = &h->s; | |
| 2269 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8; | |
| 2270 const int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8; | |
| 2271 const int luma_xy= (mx&3) + ((my&3)<<2); | |
| 2272 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*s->linesize; | |
| 2273 uint8_t * src_cb= pic->data[1] + (mx>>3) + (my>>3)*s->uvlinesize; | |
| 2274 uint8_t * src_cr= pic->data[2] + (mx>>3) + (my>>3)*s->uvlinesize; | |
| 2275 int extra_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; //FIXME increase edge?, IMHO not worth it | |
| 2276 int extra_height= extra_width; | |
| 2277 int emu=0; | |
| 2278 const int full_mx= mx>>2; | |
| 2279 const int full_my= my>>2; | |
| 2280 | |
| 2281 assert(pic->data[0]); | |
| 2282 | |
| 2283 if(mx&7) extra_width -= 3; | |
| 2284 if(my&7) extra_height -= 3; | |
| 2285 | |
| 2286 if( full_mx < 0-extra_width | |
| 2287 || full_my < 0-extra_height | |
| 2288 || full_mx + 16/*FIXME*/ > s->width + extra_width | |
| 2289 || full_my + 16/*FIXME*/ > s->height + extra_height){ | |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
2290 ff_emulated_edge_mc(s->edge_emu_buffer, src_y - 2 - 2*s->linesize, s->linesize, 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, s->width, s->height); |
| 1168 | 2291 src_y= s->edge_emu_buffer + 2 + 2*s->linesize; |
| 2292 emu=1; | |
| 2293 } | |
| 2294 | |
| 2295 qpix_op[luma_xy](dest_y, src_y, s->linesize); //FIXME try variable height perhaps? | |
| 2296 if(!square){ | |
| 2297 qpix_op[luma_xy](dest_y + delta, src_y + delta, s->linesize); | |
| 2298 } | |
| 2299 | |
| 2300 if(s->flags&CODEC_FLAG_GRAY) return; | |
| 2301 | |
| 2302 if(emu){ | |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
2303 ff_emulated_edge_mc(s->edge_emu_buffer, src_cb, s->uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), s->width>>1, s->height>>1); |
| 1168 | 2304 src_cb= s->edge_emu_buffer; |
| 2305 } | |
| 2306 chroma_op(dest_cb, src_cb, s->uvlinesize, chroma_height, mx&7, my&7); | |
| 2307 | |
| 2308 if(emu){ | |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
2309 ff_emulated_edge_mc(s->edge_emu_buffer, src_cr, s->uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), s->width>>1, s->height>>1); |
| 1168 | 2310 src_cr= s->edge_emu_buffer; |
| 2311 } | |
| 2312 chroma_op(dest_cr, src_cr, s->uvlinesize, chroma_height, mx&7, my&7); | |
| 2313 } | |
| 2314 | |
| 2415 | 2315 static inline void mc_part_std(H264Context *h, int n, int square, int chroma_height, int delta, |
| 1168 | 2316 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
| 2317 int x_offset, int y_offset, | |
| 2318 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2319 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
| 2320 int list0, int list1){ | |
| 2321 MpegEncContext * const s = &h->s; | |
| 2322 qpel_mc_func *qpix_op= qpix_put; | |
| 2323 h264_chroma_mc_func chroma_op= chroma_put; | |
| 2324 | |
| 2325 dest_y += 2*x_offset + 2*y_offset*s-> linesize; | |
| 2326 dest_cb += x_offset + y_offset*s->uvlinesize; | |
| 2327 dest_cr += x_offset + y_offset*s->uvlinesize; | |
| 2328 x_offset += 8*s->mb_x; | |
| 2329 y_offset += 8*s->mb_y; | |
| 2330 | |
| 2331 if(list0){ | |
| 1169 | 2332 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ]; |
| 1168 | 2333 mc_dir_part(h, ref, n, square, chroma_height, delta, 0, |
| 2334 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2335 qpix_op, chroma_op); | |
| 2336 | |
| 2337 qpix_op= qpix_avg; | |
| 2338 chroma_op= chroma_avg; | |
| 2339 } | |
| 2340 | |
| 2341 if(list1){ | |
| 1169 | 2342 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ]; |
| 1168 | 2343 mc_dir_part(h, ref, n, square, chroma_height, delta, 1, |
| 2344 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2345 qpix_op, chroma_op); | |
| 2346 } | |
| 2347 } | |
| 2348 | |
| 2415 | 2349 static inline void mc_part_weighted(H264Context *h, int n, int square, int chroma_height, int delta, |
| 2350 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2351 int x_offset, int y_offset, | |
| 2352 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2353 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op, | |
| 2354 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg, | |
| 2355 int list0, int list1){ | |
| 2356 MpegEncContext * const s = &h->s; | |
| 2357 | |
| 2358 dest_y += 2*x_offset + 2*y_offset*s-> linesize; | |
| 2359 dest_cb += x_offset + y_offset*s->uvlinesize; | |
| 2360 dest_cr += x_offset + y_offset*s->uvlinesize; | |
| 2361 x_offset += 8*s->mb_x; | |
| 2362 y_offset += 8*s->mb_y; | |
| 2363 | |
| 2364 if(list0 && list1){ | |
| 2365 /* don't optimize for luma-only case, since B-frames usually | |
| 2366 * use implicit weights => chroma too. */ | |
| 2367 uint8_t *tmp_cb = s->obmc_scratchpad; | |
| 2368 uint8_t *tmp_cr = tmp_cb + 8*s->uvlinesize; | |
| 2369 uint8_t *tmp_y = tmp_cr + 8*s->uvlinesize; | |
| 2370 int refn0 = h->ref_cache[0][ scan8[n] ]; | |
| 2371 int refn1 = h->ref_cache[1][ scan8[n] ]; | |
| 2372 | |
| 2373 mc_dir_part(h, &h->ref_list[0][refn0], n, square, chroma_height, delta, 0, | |
| 2374 dest_y, dest_cb, dest_cr, | |
| 2375 x_offset, y_offset, qpix_put, chroma_put); | |
| 2376 mc_dir_part(h, &h->ref_list[1][refn1], n, square, chroma_height, delta, 1, | |
| 2377 tmp_y, tmp_cb, tmp_cr, | |
| 2378 x_offset, y_offset, qpix_put, chroma_put); | |
| 2379 | |
| 2380 if(h->use_weight == 2){ | |
| 2381 int weight0 = h->implicit_weight[refn0][refn1]; | |
| 2382 int weight1 = 64 - weight0; | |
| 2383 luma_weight_avg( dest_y, tmp_y, s-> linesize, 5, weight0, weight1, 0, 0); | |
| 2384 chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, 5, weight0, weight1, 0, 0); | |
| 2385 chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, 5, weight0, weight1, 0, 0); | |
| 2386 }else{ | |
| 2387 luma_weight_avg(dest_y, tmp_y, s->linesize, h->luma_log2_weight_denom, | |
| 2388 h->luma_weight[0][refn0], h->luma_weight[1][refn1], | |
| 2389 h->luma_offset[0][refn0], h->luma_offset[1][refn1]); | |
| 2390 chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, h->chroma_log2_weight_denom, | |
| 2391 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0], | |
| 2392 h->chroma_offset[0][refn0][0], h->chroma_offset[1][refn1][0]); | |
| 2393 chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, h->chroma_log2_weight_denom, | |
| 2394 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1], | |
| 2395 h->chroma_offset[0][refn0][1], h->chroma_offset[1][refn1][1]); | |
| 2396 } | |
| 2397 }else{ | |
| 2398 int list = list1 ? 1 : 0; | |
| 2399 int refn = h->ref_cache[list][ scan8[n] ]; | |
| 2400 Picture *ref= &h->ref_list[list][refn]; | |
| 2401 mc_dir_part(h, ref, n, square, chroma_height, delta, list, | |
| 2402 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2403 qpix_put, chroma_put); | |
| 2404 | |
| 2405 luma_weight_op(dest_y, s->linesize, h->luma_log2_weight_denom, | |
| 2406 h->luma_weight[list][refn], h->luma_offset[list][refn]); | |
| 2407 if(h->use_weight_chroma){ | |
| 2408 chroma_weight_op(dest_cb, s->uvlinesize, h->chroma_log2_weight_denom, | |
| 2409 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]); | |
| 2410 chroma_weight_op(dest_cr, s->uvlinesize, h->chroma_log2_weight_denom, | |
| 2411 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]); | |
| 2412 } | |
| 2413 } | |
| 2414 } | |
| 2415 | |
| 2416 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta, | |
| 2417 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2418 int x_offset, int y_offset, | |
| 2419 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2420 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
| 2421 h264_weight_func *weight_op, h264_biweight_func *weight_avg, | |
| 2422 int list0, int list1){ | |
| 2423 if((h->use_weight==2 && list0 && list1 | |
| 2424 && (h->implicit_weight[ h->ref_cache[0][scan8[n]] ][ h->ref_cache[1][scan8[n]] ] != 32)) | |
| 2425 || h->use_weight==1) | |
| 2426 mc_part_weighted(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
| 2427 x_offset, y_offset, qpix_put, chroma_put, | |
| 2428 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1); | |
| 2429 else | |
| 2430 mc_part_std(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
| 2431 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1); | |
| 2432 } | |
| 2433 | |
| 1168 | 2434 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
| 2435 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put), | |
| 2415 | 2436 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg), |
| 2437 h264_weight_func *weight_op, h264_biweight_func *weight_avg){ | |
| 1168 | 2438 MpegEncContext * const s = &h->s; |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2439 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 2440 const int mb_type= s->current_picture.mb_type[mb_xy]; |
| 2441 | |
| 2442 assert(IS_INTER(mb_type)); | |
| 2443 | |
| 2444 if(IS_16X16(mb_type)){ | |
| 2445 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2446 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0], | |
| 2415 | 2447 &weight_op[0], &weight_avg[0], |
| 1168 | 2448 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 2449 }else if(IS_16X8(mb_type)){ | |
| 2450 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2451 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
| 2415 | 2452 &weight_op[1], &weight_avg[1], |
| 1168 | 2453 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 2454 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4, | |
| 2455 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
| 2415 | 2456 &weight_op[1], &weight_avg[1], |
| 1168 | 2457 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
| 2458 }else if(IS_8X16(mb_type)){ | |
| 2459 mc_part(h, 0, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2460 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
| 2415 | 2461 &weight_op[2], &weight_avg[2], |
| 1168 | 2462 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 2463 mc_part(h, 4, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 4, 0, | |
| 2464 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
| 2415 | 2465 &weight_op[2], &weight_avg[2], |
| 1168 | 2466 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
| 2467 }else{ | |
| 2468 int i; | |
| 2469 | |
| 2470 assert(IS_8X8(mb_type)); | |
| 2471 | |
| 2472 for(i=0; i<4; i++){ | |
| 2473 const int sub_mb_type= h->sub_mb_type[i]; | |
| 2474 const int n= 4*i; | |
| 2475 int x_offset= (i&1)<<2; | |
| 2476 int y_offset= (i&2)<<1; | |
| 2477 | |
| 2478 if(IS_SUB_8X8(sub_mb_type)){ | |
| 2479 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2480 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
| 2415 | 2481 &weight_op[3], &weight_avg[3], |
| 1168 | 2482 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2483 }else if(IS_SUB_8X4(sub_mb_type)){ | |
| 2484 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2485 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
| 2415 | 2486 &weight_op[4], &weight_avg[4], |
| 1168 | 2487 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2488 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2, | |
| 2489 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
| 2415 | 2490 &weight_op[4], &weight_avg[4], |
| 1168 | 2491 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2492 }else if(IS_SUB_4X8(sub_mb_type)){ | |
| 2493 mc_part(h, n , 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2494 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
| 2415 | 2495 &weight_op[5], &weight_avg[5], |
| 1168 | 2496 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2497 mc_part(h, n+1, 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset, | |
| 2498 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
| 2415 | 2499 &weight_op[5], &weight_avg[5], |
| 1168 | 2500 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2501 }else{ | |
| 2502 int j; | |
| 2503 assert(IS_SUB_4X4(sub_mb_type)); | |
| 2504 for(j=0; j<4; j++){ | |
| 2505 int sub_x_offset= x_offset + 2*(j&1); | |
| 2506 int sub_y_offset= y_offset + (j&2); | |
| 2507 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset, | |
| 2508 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
| 2415 | 2509 &weight_op[6], &weight_avg[6], |
| 1168 | 2510 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2511 } | |
| 2512 } | |
| 2513 } | |
| 2514 } | |
| 2515 } | |
| 2516 | |
| 2517 static void decode_init_vlc(H264Context *h){ | |
| 2518 static int done = 0; | |
| 2519 | |
| 2520 if (!done) { | |
| 2521 int i; | |
| 2522 done = 1; | |
| 2523 | |
| 2524 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5, | |
| 2525 &chroma_dc_coeff_token_len [0], 1, 1, | |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2526 &chroma_dc_coeff_token_bits[0], 1, 1, 1); |
| 1168 | 2527 |
| 2528 for(i=0; i<4; i++){ | |
| 2529 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17, | |
| 2530 &coeff_token_len [i][0], 1, 1, | |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2531 &coeff_token_bits[i][0], 1, 1, 1); |
| 1168 | 2532 } |
| 2533 | |
| 2534 for(i=0; i<3; i++){ | |
| 2535 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4, | |
| 2536 &chroma_dc_total_zeros_len [i][0], 1, 1, | |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2537 &chroma_dc_total_zeros_bits[i][0], 1, 1, 1); |
| 1168 | 2538 } |
| 2539 for(i=0; i<15; i++){ | |
| 2540 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16, | |
| 2541 &total_zeros_len [i][0], 1, 1, | |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2542 &total_zeros_bits[i][0], 1, 1, 1); |
| 1168 | 2543 } |
| 2544 | |
| 2545 for(i=0; i<6; i++){ | |
| 2546 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7, | |
| 2547 &run_len [i][0], 1, 1, | |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2548 &run_bits[i][0], 1, 1, 1); |
| 1168 | 2549 } |
| 2550 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16, | |
| 2551 &run_len [6][0], 1, 1, | |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2365
diff
changeset
|
2552 &run_bits[6][0], 1, 1, 1); |
| 1168 | 2553 } |
| 2554 } | |
| 2555 | |
| 2556 /** | |
| 2557 * Sets the intra prediction function pointers. | |
| 2558 */ | |
| 2559 static void init_pred_ptrs(H264Context *h){ | |
| 2560 // MpegEncContext * const s = &h->s; | |
| 2561 | |
| 2562 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; | |
| 2563 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; | |
| 2564 h->pred4x4[DC_PRED ]= pred4x4_dc_c; | |
| 2565 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c; | |
| 2566 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c; | |
| 2567 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c; | |
| 2568 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c; | |
| 2569 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c; | |
| 2570 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c; | |
| 2571 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c; | |
| 2572 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c; | |
| 2573 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; | |
| 2574 | |
| 2575 h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c; | |
| 2576 h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c; | |
| 2577 h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c; | |
| 2578 h->pred8x8[PLANE_PRED8x8 ]= pred8x8_plane_c; | |
| 2579 h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c; | |
| 2580 h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c; | |
| 2581 h->pred8x8[DC_128_PRED8x8 ]= pred8x8_128_dc_c; | |
| 2582 | |
| 2583 h->pred16x16[DC_PRED8x8 ]= pred16x16_dc_c; | |
| 2584 h->pred16x16[VERT_PRED8x8 ]= pred16x16_vertical_c; | |
| 2585 h->pred16x16[HOR_PRED8x8 ]= pred16x16_horizontal_c; | |
| 2586 h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c; | |
| 2587 h->pred16x16[LEFT_DC_PRED8x8]= pred16x16_left_dc_c; | |
| 2588 h->pred16x16[TOP_DC_PRED8x8 ]= pred16x16_top_dc_c; | |
| 2589 h->pred16x16[DC_128_PRED8x8 ]= pred16x16_128_dc_c; | |
| 2590 } | |
| 2591 | |
| 2592 static void free_tables(H264Context *h){ | |
| 2593 av_freep(&h->intra4x4_pred_mode); | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2594 av_freep(&h->chroma_pred_mode_table); |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2595 av_freep(&h->cbp_table); |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2596 av_freep(&h->mvd_table[0]); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2597 av_freep(&h->mvd_table[1]); |
| 2396 | 2598 av_freep(&h->direct_table); |
| 1168 | 2599 av_freep(&h->non_zero_count); |
| 2600 av_freep(&h->slice_table_base); | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2601 av_freep(&h->top_border); |
| 1168 | 2602 h->slice_table= NULL; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2603 |
| 1168 | 2604 av_freep(&h->mb2b_xy); |
| 2605 av_freep(&h->mb2b8_xy); | |
| 2415 | 2606 |
| 2607 av_freep(&h->s.obmc_scratchpad); | |
| 1168 | 2608 } |
| 2609 | |
| 2610 /** | |
| 2611 * allocates tables. | |
| 2612 * needs widzh/height | |
| 2613 */ | |
| 2614 static int alloc_tables(H264Context *h){ | |
| 2615 MpegEncContext * const s = &h->s; | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2616 const int big_mb_num= s->mb_stride * (s->mb_height+1); |
| 1168 | 2617 int x,y; |
| 2618 | |
| 2619 CHECKED_ALLOCZ(h->intra4x4_pred_mode, big_mb_num * 8 * sizeof(uint8_t)) | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2620 |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2621 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t)) |
| 1168 | 2622 CHECKED_ALLOCZ(h->slice_table_base , big_mb_num * sizeof(uint8_t)) |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2623 CHECKED_ALLOCZ(h->top_border , s->mb_width * (16+8+8) * sizeof(uint8_t)) |
| 2336 | 2624 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t)) |
| 1168 | 2625 |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2626 if( h->pps.cabac ) { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2627 CHECKED_ALLOCZ(h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t)) |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2628 CHECKED_ALLOCZ(h->mvd_table[0], 32*big_mb_num * sizeof(uint16_t)); |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
2629 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t)); |
| 2396 | 2630 CHECKED_ALLOCZ(h->direct_table, 32*big_mb_num * sizeof(uint8_t)); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2631 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2632 |
| 1168 | 2633 memset(h->slice_table_base, -1, big_mb_num * sizeof(uint8_t)); |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2634 h->slice_table= h->slice_table_base + s->mb_stride + 1; |
| 1168 | 2635 |
| 2636 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint16_t)); | |
| 2637 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint16_t)); | |
| 2638 for(y=0; y<s->mb_height; y++){ | |
| 2639 for(x=0; x<s->mb_width; x++){ | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2640 const int mb_xy= x + y*s->mb_stride; |
| 1168 | 2641 const int b_xy = 4*x + 4*y*h->b_stride; |
| 2642 const int b8_xy= 2*x + 2*y*h->b8_stride; | |
| 2643 | |
| 2644 h->mb2b_xy [mb_xy]= b_xy; | |
| 2645 h->mb2b8_xy[mb_xy]= b8_xy; | |
| 2646 } | |
| 2647 } | |
| 2415 | 2648 |
| 2417 | 2649 s->obmc_scratchpad = NULL; |
| 2650 | |
| 1168 | 2651 return 0; |
| 2652 fail: | |
| 2653 free_tables(h); | |
| 2654 return -1; | |
| 2655 } | |
| 2656 | |
| 2657 static void common_init(H264Context *h){ | |
| 2658 MpegEncContext * const s = &h->s; | |
| 2659 | |
| 2660 s->width = s->avctx->width; | |
| 2661 s->height = s->avctx->height; | |
| 2662 s->codec_id= s->avctx->codec->id; | |
| 2663 | |
| 2664 init_pred_ptrs(h); | |
| 2665 | |
| 1698 | 2666 s->unrestricted_mv=1; |
| 1168 | 2667 s->decode=1; //FIXME |
| 2668 } | |
| 2669 | |
| 2670 static int decode_init(AVCodecContext *avctx){ | |
| 2671 H264Context *h= avctx->priv_data; | |
| 2672 MpegEncContext * const s = &h->s; | |
| 2673 | |
| 1892 | 2674 MPV_decode_defaults(s); |
| 2675 | |
| 1168 | 2676 s->avctx = avctx; |
| 2677 common_init(h); | |
| 2678 | |
| 2679 s->out_format = FMT_H264; | |
| 2680 s->workaround_bugs= avctx->workaround_bugs; | |
| 2681 | |
| 2682 // set defaults | |
| 2683 // s->decode_mb= ff_h263_decode_mb; | |
| 2684 s->low_delay= 1; | |
| 2685 avctx->pix_fmt= PIX_FMT_YUV420P; | |
| 2686 | |
| 2687 decode_init_vlc(h); | |
| 2688 | |
|
2547
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2689 if(avctx->extradata_size > 0 && avctx->extradata && |
|
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2690 *(char *)avctx->extradata == 1){ |
| 2227 | 2691 h->is_avc = 1; |
| 2692 h->got_avcC = 0; | |
|
2547
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2693 } else { |
|
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
2694 h->is_avc = 0; |
| 2227 | 2695 } |
| 2696 | |
| 1168 | 2697 return 0; |
| 2698 } | |
| 2699 | |
| 2700 static void frame_start(H264Context *h){ | |
| 2701 MpegEncContext * const s = &h->s; | |
| 2702 int i; | |
| 2703 | |
| 2704 MPV_frame_start(s, s->avctx); | |
| 2705 ff_er_frame_start(s); | |
| 2706 | |
| 2707 assert(s->linesize && s->uvlinesize); | |
| 2708 | |
| 2709 for(i=0; i<16; i++){ | |
| 2710 h->block_offset[i]= 4*((scan8[i] - scan8[0])&7) + 4*s->linesize*((scan8[i] - scan8[0])>>3); | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2711 h->block_offset[24+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->linesize*((scan8[i] - scan8[0])>>3); |
| 1168 | 2712 } |
| 2713 for(i=0; i<4; i++){ | |
| 2714 h->block_offset[16+i]= | |
| 2715 h->block_offset[20+i]= 4*((scan8[i] - scan8[0])&7) + 4*s->uvlinesize*((scan8[i] - scan8[0])>>3); | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2716 h->block_offset[24+16+i]= |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2717 h->block_offset[24+20+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->uvlinesize*((scan8[i] - scan8[0])>>3); |
| 1168 | 2718 } |
| 2719 | |
|
2416
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2720 /* can't be in alloc_tables because linesize isn't known there. |
|
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2721 * FIXME: redo bipred weight to not require extra buffer? */ |
|
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2722 if(!s->obmc_scratchpad) |
|
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2723 s->obmc_scratchpad = av_malloc(16*s->linesize + 2*8*s->uvlinesize); |
|
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
2724 |
| 1168 | 2725 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; |
| 2726 } | |
| 2727 | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2728 static inline void backup_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize){ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2729 MpegEncContext * const s = &h->s; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2730 int i; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2731 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2732 src_y -= linesize; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2733 src_cb -= uvlinesize; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2734 src_cr -= uvlinesize; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2735 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2736 // There is two lines saved, the line above the the top macroblock of a pair, |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2737 // and the line above the bottom macroblock |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2738 h->left_border[0]= h->top_border[s->mb_x][15]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2739 for(i=1; i<17; i++){ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2740 h->left_border[i]= src_y[15+i* linesize]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2741 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2742 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2743 *(uint64_t*)(h->top_border[s->mb_x]+0)= *(uint64_t*)(src_y + 16*linesize); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2744 *(uint64_t*)(h->top_border[s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2745 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2746 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2747 h->left_border[17 ]= h->top_border[s->mb_x][16+7]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2748 h->left_border[17+9]= h->top_border[s->mb_x][24+7]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2749 for(i=1; i<9; i++){ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2750 h->left_border[i+17 ]= src_cb[7+i*uvlinesize]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2751 h->left_border[i+17+9]= src_cr[7+i*uvlinesize]; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2752 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2753 *(uint64_t*)(h->top_border[s->mb_x]+16)= *(uint64_t*)(src_cb+8*uvlinesize); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2754 *(uint64_t*)(h->top_border[s->mb_x]+24)= *(uint64_t*)(src_cr+8*uvlinesize); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2755 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2756 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2757 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2758 static inline void xchg_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg){ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2759 MpegEncContext * const s = &h->s; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2760 int temp8, i; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2761 uint64_t temp64; |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2762 int deblock_left = (s->mb_x > 0); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2763 int deblock_top = (s->mb_y > 0); |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2764 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2765 src_y -= linesize + 1; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2766 src_cb -= uvlinesize + 1; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2767 src_cr -= uvlinesize + 1; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2768 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2769 #define XCHG(a,b,t,xchg)\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2770 t= a;\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2771 if(xchg)\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2772 a= b;\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2773 b= t; |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2774 |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2775 if(deblock_left){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2776 for(i = !deblock_top; i<17; i++){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2777 XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2778 } |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2779 } |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2780 |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2781 if(deblock_top){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2782 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2783 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2784 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2785 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2786 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2787 if(deblock_left){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2788 for(i = !deblock_top; i<9; i++){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2789 XCHG(h->left_border[i+17 ], src_cb[i*uvlinesize], temp8, xchg); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2790 XCHG(h->left_border[i+17+9], src_cr[i*uvlinesize], temp8, xchg); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2791 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2792 } |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2793 if(deblock_top){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2794 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2795 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1); |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
2796 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2797 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2798 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2799 |
| 1168 | 2800 static void hl_decode_mb(H264Context *h){ |
| 2801 MpegEncContext * const s = &h->s; | |
| 2802 const int mb_x= s->mb_x; | |
| 2803 const int mb_y= s->mb_y; | |
|
1177
fea03d2c4946
simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents:
1174
diff
changeset
|
2804 const int mb_xy= mb_x + mb_y*s->mb_stride; |
| 1168 | 2805 const int mb_type= s->current_picture.mb_type[mb_xy]; |
| 2806 uint8_t *dest_y, *dest_cb, *dest_cr; | |
| 2807 int linesize, uvlinesize /*dct_offset*/; | |
| 2808 int i; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2809 int *block_offset = &h->block_offset[0]; |
| 1168 | 2810 |
| 2811 if(!s->decode) | |
| 2812 return; | |
| 2813 | |
| 2814 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; | |
| 2815 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 2816 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 2817 | |
| 2818 if (h->mb_field_decoding_flag) { | |
| 2819 linesize = s->linesize * 2; | |
| 2820 uvlinesize = s->uvlinesize * 2; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2821 block_offset = &h->block_offset[24]; |
| 1168 | 2822 if(mb_y&1){ //FIXME move out of this func? |
| 2823 dest_y -= s->linesize*15; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2824 dest_cb-= s->uvlinesize*7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2825 dest_cr-= s->uvlinesize*7; |
| 1168 | 2826 } |
| 2827 } else { | |
| 2828 linesize = s->linesize; | |
| 2829 uvlinesize = s->uvlinesize; | |
| 2830 // dct_offset = s->linesize * 16; | |
| 2831 } | |
| 2832 | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2833 if (IS_INTRA_PCM(mb_type)) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2834 unsigned int x, y; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2835 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2836 // The pixels are stored in h->mb array in the same order as levels, |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2837 // copy them in output in the correct order. |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2838 for(i=0; i<16; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2839 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2840 for (x=0; x<4; x++) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2841 *(dest_y + block_offset[i] + y*linesize + x) = h->mb[i*16+y*4+x]; |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2842 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2843 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2844 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2845 for(i=16; i<16+4; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2846 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2847 for (x=0; x<4; x++) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2848 *(dest_cb + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x]; |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2849 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2850 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2851 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2852 for(i=20; i<20+4; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2853 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2854 for (x=0; x<4; x++) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2855 *(dest_cr + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x]; |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2856 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2857 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
2858 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2859 } else { |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2860 if(IS_INTRA(mb_type)){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2861 if(h->deblocking_filter) |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2862 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2863 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2864 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2865 h->pred8x8[ h->chroma_pred_mode ](dest_cb, uvlinesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2866 h->pred8x8[ h->chroma_pred_mode ](dest_cr, uvlinesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2867 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2868 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2869 if(IS_INTRA4x4(mb_type)){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2870 if(!s->encoding){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2871 for(i=0; i<16; i++){ |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2872 uint8_t * const ptr= dest_y + block_offset[i]; |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2873 uint8_t *topright; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2874 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ]; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2875 int tr; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2876 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2877 if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2878 const int topright_avail= (h->topright_samples_available<<i)&0x8000; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2879 assert(mb_y || linesize <= block_offset[i]); |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2880 if(!topright_avail){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2881 tr= ptr[3 - linesize]*0x01010101; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2882 topright= (uint8_t*) &tr; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2883 }else if(i==5 && h->deblocking_filter){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2884 tr= *(uint32_t*)h->top_border[mb_x+1]; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2885 topright= (uint8_t*) &tr; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2886 }else |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2887 topright= ptr + 4 - linesize; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2888 }else |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2889 topright= NULL; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2890 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2891 h->pred4x4[ dir ](ptr, topright, linesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2892 if(h->non_zero_count_cache[ scan8[i] ]){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2893 if(s->codec_id == CODEC_ID_H264) |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2894 s->dsp.h264_idct_add(ptr, h->mb + i*16, linesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2895 else |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2896 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2897 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2898 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2899 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2900 }else{ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2901 h->pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2902 if(s->codec_id == CODEC_ID_H264) |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2903 h264_luma_dc_dequant_idct_c(h->mb, s->qscale); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2904 else |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2905 svq3_luma_dc_dequant_idct_c(h->mb, s->qscale); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2906 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2907 if(h->deblocking_filter) |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2908 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2909 }else if(s->codec_id == CODEC_ID_H264){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2910 hl_motion(h, dest_y, dest_cb, dest_cr, |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2911 s->dsp.put_h264_qpel_pixels_tab, s->dsp.put_h264_chroma_pixels_tab, |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2912 s->dsp.avg_h264_qpel_pixels_tab, s->dsp.avg_h264_chroma_pixels_tab, |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2913 s->dsp.weight_h264_pixels_tab, s->dsp.biweight_h264_pixels_tab); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2914 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2915 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2916 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2917 if(!IS_INTRA4x4(mb_type)){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2918 if(s->codec_id == CODEC_ID_H264){ |
| 1168 | 2919 for(i=0; i<16; i++){ |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2920 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2921 uint8_t * const ptr= dest_y + block_offset[i]; |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2922 s->dsp.h264_idct_add(ptr, h->mb + i*16, linesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2923 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2924 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2925 }else{ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2926 for(i=0; i<16; i++){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2927 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2928 uint8_t * const ptr= dest_y + block_offset[i]; |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2929 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); |
| 1234 | 2930 } |
| 1168 | 2931 } |
| 2932 } | |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2933 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2934 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2935 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2936 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2937 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2938 if(s->codec_id == CODEC_ID_H264){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2939 for(i=16; i<16+4; i++){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2940 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2941 uint8_t * const ptr= dest_cb + block_offset[i]; |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2942 s->dsp.h264_idct_add(ptr, h->mb + i*16, uvlinesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2943 } |
| 1250 | 2944 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2945 for(i=20; i<20+4; i++){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2946 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2947 uint8_t * const ptr= dest_cr + block_offset[i]; |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2948 s->dsp.h264_idct_add(ptr, h->mb + i*16, uvlinesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2949 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2950 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2951 }else{ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2952 for(i=16; i<16+4; i++){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2953 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2954 uint8_t * const ptr= dest_cb + block_offset[i]; |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2955 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2956 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2957 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2958 for(i=20; i<20+4; i++){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2959 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
2960 uint8_t * const ptr= dest_cr + block_offset[i]; |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2961 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
2962 } |
| 1250 | 2963 } |
| 1168 | 2964 } |
| 2965 } | |
| 2966 } | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2967 if(h->deblocking_filter) { |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2968 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize); |
| 2449 | 2969 fill_caches(h, mb_type, 1); //FIXME dont fill stuff which isnt used by filter_mb |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2970 filter_mb(h, mb_x, mb_y, dest_y, dest_cb, dest_cr); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2971 } |
| 1168 | 2972 } |
| 2973 | |
| 2974 /** | |
| 2975 * fills the default_ref_list. | |
| 2976 */ | |
| 2977 static int fill_default_ref_list(H264Context *h){ | |
| 2978 MpegEncContext * const s = &h->s; | |
| 2979 int i; | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
2980 int smallest_poc_greater_than_current = -1; |
| 1168 | 2981 Picture sorted_short_ref[16]; |
| 2982 | |
| 2983 if(h->slice_type==B_TYPE){ | |
| 2984 int out_i; | |
| 2985 int limit= -1; | |
| 2986 | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
2987 /* sort frame according to poc in B slice */ |
| 1168 | 2988 for(out_i=0; out_i<h->short_ref_count; out_i++){ |
| 2989 int best_i=-1; | |
|
2255
507690ff49a2
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2254
diff
changeset
|
2990 int best_poc=INT_MAX; |
| 1168 | 2991 |
| 2992 for(i=0; i<h->short_ref_count; i++){ | |
| 2993 const int poc= h->short_ref[i]->poc; | |
| 2994 if(poc > limit && poc < best_poc){ | |
| 2995 best_poc= poc; | |
| 2996 best_i= i; | |
| 2997 } | |
| 2998 } | |
| 2999 | |
| 3000 assert(best_i != -1); | |
| 3001 | |
| 3002 limit= best_poc; | |
| 3003 sorted_short_ref[out_i]= *h->short_ref[best_i]; | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3004 tprintf("sorted poc: %d->%d poc:%d fn:%d\n", best_i, out_i, sorted_short_ref[out_i].poc, sorted_short_ref[out_i].frame_num); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3005 if (-1 == smallest_poc_greater_than_current) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3006 if (h->short_ref[best_i]->poc >= s->current_picture_ptr->poc) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3007 smallest_poc_greater_than_current = out_i; |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3008 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3009 } |
| 1168 | 3010 } |
| 3011 } | |
| 3012 | |
| 3013 if(s->picture_structure == PICT_FRAME){ | |
| 3014 if(h->slice_type==B_TYPE){ | |
| 3015 int list; | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3016 tprintf("current poc: %d, smallest_poc_greater_than_current: %d\n", s->current_picture_ptr->poc, smallest_poc_greater_than_current); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3017 |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3018 // find the largest poc |
| 1168 | 3019 for(list=0; list<2; list++){ |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3020 int index = 0; |
| 2447 | 3021 int j= -99; |
| 3022 int step= list ? -1 : 1; | |
| 3023 | |
| 3024 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++, j+=step) { | |
| 3025 while(j<0 || j>= h->short_ref_count){ | |
| 3026 step = -step; | |
| 3027 j= smallest_poc_greater_than_current + (step>>1); | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3028 } |
| 2447 | 3029 if(sorted_short_ref[j].reference != 3) continue; |
| 3030 h->default_ref_list[list][index ]= sorted_short_ref[j]; | |
| 3031 h->default_ref_list[list][index++].pic_id= sorted_short_ref[j].frame_num; | |
| 1168 | 3032 } |
| 3033 | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3034 for(i = 0; i < 16 && index < h->ref_count[ list ]; i++){ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3035 if(h->long_ref[i] == NULL) continue; |
| 1168 | 3036 if(h->long_ref[i]->reference != 3) continue; |
| 3037 | |
| 3038 h->default_ref_list[ list ][index ]= *h->long_ref[i]; | |
| 3039 h->default_ref_list[ list ][index++].pic_id= i;; | |
| 3040 } | |
| 3041 | |
| 2447 | 3042 if(list && (smallest_poc_greater_than_current<=0 || smallest_poc_greater_than_current>=h->short_ref_count) && (1 < index)){ |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3043 // swap the two first elements of L1 when |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3044 // L0 and L1 are identical |
| 1168 | 3045 Picture temp= h->default_ref_list[1][0]; |
| 3046 h->default_ref_list[1][0] = h->default_ref_list[1][1]; | |
| 3047 h->default_ref_list[1][0] = temp; | |
| 3048 } | |
| 3049 | |
| 3050 if(index < h->ref_count[ list ]) | |
| 3051 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index)); | |
| 3052 } | |
| 3053 }else{ | |
| 3054 int index=0; | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3055 for(i=0; i<h->short_ref_count; i++){ |
| 1168 | 3056 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit |
| 3057 h->default_ref_list[0][index ]= *h->short_ref[i]; | |
| 3058 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num; | |
| 3059 } | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3060 for(i = 0; i < 16; i++){ |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3061 if(h->long_ref[i] == NULL) continue; |
| 1168 | 3062 if(h->long_ref[i]->reference != 3) continue; |
| 3063 h->default_ref_list[0][index ]= *h->long_ref[i]; | |
| 3064 h->default_ref_list[0][index++].pic_id= i;; | |
| 3065 } | |
| 3066 if(index < h->ref_count[0]) | |
| 3067 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index)); | |
| 3068 } | |
| 3069 }else{ //FIELD | |
| 3070 if(h->slice_type==B_TYPE){ | |
| 3071 }else{ | |
| 3072 //FIXME second field balh | |
| 3073 } | |
| 3074 } | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3075 #ifdef TRACE |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3076 for (i=0; i<h->ref_count[0]; i++) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3077 tprintf("List0: %s fn:%d 0x%p\n", (h->default_ref_list[0][i].long_ref ? "LT" : "ST"), h->default_ref_list[0][i].pic_id, h->default_ref_list[0][i].data[0]); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3078 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3079 if(h->slice_type==B_TYPE){ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3080 for (i=0; i<h->ref_count[1]; i++) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3081 tprintf("List1: %s fn:%d 0x%p\n", (h->default_ref_list[1][i].long_ref ? "LT" : "ST"), h->default_ref_list[1][i].pic_id, h->default_ref_list[0][i].data[0]); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3082 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3083 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3084 #endif |
| 1168 | 3085 return 0; |
| 3086 } | |
| 3087 | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3088 static void print_short_term(H264Context *h); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3089 static void print_long_term(H264Context *h); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3090 |
| 1168 | 3091 static int decode_ref_pic_list_reordering(H264Context *h){ |
| 3092 MpegEncContext * const s = &h->s; | |
| 3093 int list; | |
| 3094 | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3095 print_short_term(h); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3096 print_long_term(h); |
| 1168 | 3097 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move beofre func |
| 3098 | |
| 3099 for(list=0; list<2; list++){ | |
| 3100 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]); | |
| 3101 | |
| 3102 if(get_bits1(&s->gb)){ | |
| 3103 int pred= h->curr_pic_num; | |
| 3104 int index; | |
| 3105 | |
| 3106 for(index=0; ; index++){ | |
| 3107 int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb); | |
| 3108 int pic_id; | |
| 3109 int i; | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3110 Picture *ref = NULL; |
| 1168 | 3111 |
|
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3112 if(reordering_of_pic_nums_idc==3) |
|
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3113 break; |
| 1168 | 3114 |
| 3115 if(index >= h->ref_count[list]){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3116 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n"); |
| 1168 | 3117 return -1; |
| 3118 } | |
| 3119 | |
| 3120 if(reordering_of_pic_nums_idc<3){ | |
| 3121 if(reordering_of_pic_nums_idc<2){ | |
| 3122 const int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1; | |
| 3123 | |
| 3124 if(abs_diff_pic_num >= h->max_pic_num){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3125 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n"); |
| 1168 | 3126 return -1; |
| 3127 } | |
| 3128 | |
| 3129 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num; | |
| 3130 else pred+= abs_diff_pic_num; | |
| 3131 pred &= h->max_pic_num - 1; | |
| 3132 | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3133 for(i= h->short_ref_count-1; i>=0; i--){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3134 ref = h->short_ref[i]; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3135 if(ref->data[0] != NULL && ref->frame_num == pred && ref->long_ref == 0) // ignore non existing pictures by testing data[0] pointer |
| 1168 | 3136 break; |
| 3137 } | |
| 3138 }else{ | |
| 3139 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3140 ref = h->long_ref[pic_id]; |
| 1168 | 3141 } |
| 3142 | |
|
2485
2844b8cf4e11
H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents:
2484
diff
changeset
|
3143 if (i < 0) { |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3144 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n"); |
| 1168 | 3145 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3146 } else { |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3147 h->ref_list[list][index]= *ref; |
| 1168 | 3148 } |
|
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3149 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3150 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n"); |
| 1168 | 3151 return -1; |
| 3152 } | |
| 3153 } | |
| 3154 } | |
| 3155 | |
| 3156 if(h->slice_type!=B_TYPE) break; | |
| 3157 } | |
| 2396 | 3158 |
| 3159 if(h->slice_type==B_TYPE && !h->direct_spatial_mv_pred) | |
| 3160 direct_dist_scale_factor(h); | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3161 direct_ref_list_init(h); |
| 1168 | 3162 return 0; |
| 3163 } | |
| 3164 | |
| 3165 static int pred_weight_table(H264Context *h){ | |
| 3166 MpegEncContext * const s = &h->s; | |
| 3167 int list, i; | |
| 2415 | 3168 int luma_def, chroma_def; |
| 1168 | 3169 |
| 2415 | 3170 h->use_weight= 0; |
| 3171 h->use_weight_chroma= 0; | |
| 1168 | 3172 h->luma_log2_weight_denom= get_ue_golomb(&s->gb); |
| 3173 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb); | |
| 2415 | 3174 luma_def = 1<<h->luma_log2_weight_denom; |
| 3175 chroma_def = 1<<h->chroma_log2_weight_denom; | |
| 1168 | 3176 |
| 3177 for(list=0; list<2; list++){ | |
| 3178 for(i=0; i<h->ref_count[list]; i++){ | |
| 3179 int luma_weight_flag, chroma_weight_flag; | |
| 3180 | |
| 3181 luma_weight_flag= get_bits1(&s->gb); | |
| 3182 if(luma_weight_flag){ | |
| 3183 h->luma_weight[list][i]= get_se_golomb(&s->gb); | |
| 3184 h->luma_offset[list][i]= get_se_golomb(&s->gb); | |
| 2415 | 3185 if( h->luma_weight[list][i] != luma_def |
| 3186 || h->luma_offset[list][i] != 0) | |
| 3187 h->use_weight= 1; | |
| 3188 }else{ | |
| 3189 h->luma_weight[list][i]= luma_def; | |
| 3190 h->luma_offset[list][i]= 0; | |
| 1168 | 3191 } |
| 3192 | |
| 3193 chroma_weight_flag= get_bits1(&s->gb); | |
| 3194 if(chroma_weight_flag){ | |
| 3195 int j; | |
| 3196 for(j=0; j<2; j++){ | |
| 3197 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb); | |
| 3198 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb); | |
| 2415 | 3199 if( h->chroma_weight[list][i][j] != chroma_def |
| 3200 || h->chroma_offset[list][i][j] != 0) | |
| 3201 h->use_weight_chroma= 1; | |
| 3202 } | |
| 3203 }else{ | |
| 3204 int j; | |
| 3205 for(j=0; j<2; j++){ | |
| 3206 h->chroma_weight[list][i][j]= chroma_def; | |
| 3207 h->chroma_offset[list][i][j]= 0; | |
| 1168 | 3208 } |
| 3209 } | |
| 3210 } | |
| 3211 if(h->slice_type != B_TYPE) break; | |
| 3212 } | |
| 2415 | 3213 h->use_weight= h->use_weight || h->use_weight_chroma; |
| 1168 | 3214 return 0; |
| 3215 } | |
| 3216 | |
| 2415 | 3217 static void implicit_weight_table(H264Context *h){ |
| 3218 MpegEncContext * const s = &h->s; | |
| 3219 int ref0, ref1; | |
| 3220 int cur_poc = s->current_picture_ptr->poc; | |
| 3221 | |
| 3222 if( h->ref_count[0] == 1 && h->ref_count[1] == 1 | |
| 3223 && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){ | |
| 3224 h->use_weight= 0; | |
| 3225 h->use_weight_chroma= 0; | |
| 3226 return; | |
| 3227 } | |
| 3228 | |
| 3229 h->use_weight= 2; | |
| 3230 h->use_weight_chroma= 2; | |
| 3231 h->luma_log2_weight_denom= 5; | |
| 3232 h->chroma_log2_weight_denom= 5; | |
| 3233 | |
| 3234 /* FIXME: MBAFF */ | |
| 3235 for(ref0=0; ref0 < h->ref_count[0]; ref0++){ | |
| 3236 int poc0 = h->ref_list[0][ref0].poc; | |
| 3237 for(ref1=0; ref1 < h->ref_count[1]; ref1++){ | |
| 2519 | 3238 int poc1 = h->ref_list[1][ref1].poc; |
| 2415 | 3239 int td = clip(poc1 - poc0, -128, 127); |
| 3240 if(td){ | |
| 3241 int tb = clip(cur_poc - poc0, -128, 127); | |
| 3242 int tx = (16384 + (ABS(td) >> 1)) / td; | |
| 3243 int dist_scale_factor = clip((tb*tx + 32) >> 6, -1024, 1023) >> 2; | |
| 3244 if(dist_scale_factor < -64 || dist_scale_factor > 128) | |
| 3245 h->implicit_weight[ref0][ref1] = 32; | |
| 3246 else | |
| 3247 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor; | |
| 3248 }else | |
| 3249 h->implicit_weight[ref0][ref1] = 32; | |
| 3250 } | |
| 3251 } | |
| 3252 } | |
| 3253 | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3254 static inline void unreference_pic(H264Context *h, Picture *pic){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3255 int i; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3256 pic->reference=0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3257 if(pic == h->delayed_output_pic) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3258 pic->reference=1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3259 else{ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3260 for(i = 0; h->delayed_pic[i]; i++) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3261 if(pic == h->delayed_pic[i]){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3262 pic->reference=1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3263 break; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3264 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3265 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3266 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3267 |
| 1168 | 3268 /** |
| 2392 | 3269 * instantaneous decoder refresh. |
| 1168 | 3270 */ |
| 3271 static void idr(H264Context *h){ | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3272 int i; |
| 1168 | 3273 |
|
2484
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3274 for(i=0; i<16; i++){ |
|
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3275 if (h->long_ref[i] != NULL) { |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3276 unreference_pic(h, h->long_ref[i]); |
|
2484
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3277 h->long_ref[i]= NULL; |
|
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3278 } |
| 1168 | 3279 } |
| 3280 h->long_ref_count=0; | |
| 3281 | |
| 3282 for(i=0; i<h->short_ref_count; i++){ | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3283 unreference_pic(h, h->short_ref[i]); |
| 1168 | 3284 h->short_ref[i]= NULL; |
| 3285 } | |
| 3286 h->short_ref_count=0; | |
| 3287 } | |
| 3288 | |
| 3289 /** | |
| 3290 * | |
| 3291 * @return the removed picture or NULL if an error occures | |
| 3292 */ | |
| 3293 static Picture * remove_short(H264Context *h, int frame_num){ | |
| 1169 | 3294 MpegEncContext * const s = &h->s; |
| 1168 | 3295 int i; |
| 3296 | |
| 1169 | 3297 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
|
3298 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count); |
| 1169 | 3299 |
| 1168 | 3300 for(i=0; i<h->short_ref_count; i++){ |
| 3301 Picture *pic= h->short_ref[i]; | |
| 1169 | 3302 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
|
3303 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic); |
| 1168 | 3304 if(pic->frame_num == frame_num){ |
| 3305 h->short_ref[i]= NULL; | |
| 3306 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*)); | |
| 3307 h->short_ref_count--; | |
| 3308 return pic; | |
| 3309 } | |
| 3310 } | |
| 3311 return NULL; | |
| 3312 } | |
| 3313 | |
| 3314 /** | |
| 3315 * | |
| 3316 * @return the removed picture or NULL if an error occures | |
| 3317 */ | |
| 3318 static Picture * remove_long(H264Context *h, int i){ | |
| 3319 Picture *pic; | |
| 3320 | |
| 3321 pic= h->long_ref[i]; | |
| 3322 h->long_ref[i]= NULL; | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3323 if(pic) h->long_ref_count--; |
| 1168 | 3324 |
| 3325 return pic; | |
| 3326 } | |
| 3327 | |
| 3328 /** | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3329 * print short term list |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3330 */ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3331 static void print_short_term(H264Context *h) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3332 uint32_t i; |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3333 if(h->s.avctx->debug&FF_DEBUG_MMCO) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3334 av_log(h->s.avctx, AV_LOG_DEBUG, "short term list:\n"); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3335 for(i=0; i<h->short_ref_count; i++){ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3336 Picture *pic= h->short_ref[i]; |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3337 av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n", i, pic->frame_num, pic->poc, pic->data[0]); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3338 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3339 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3340 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3341 |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3342 /** |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3343 * print long term list |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3344 */ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3345 static void print_long_term(H264Context *h) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3346 uint32_t i; |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3347 if(h->s.avctx->debug&FF_DEBUG_MMCO) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3348 av_log(h->s.avctx, AV_LOG_DEBUG, "long term list:\n"); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3349 for(i = 0; i < 16; i++){ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3350 Picture *pic= h->long_ref[i]; |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3351 if (pic) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3352 av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n", i, pic->frame_num, pic->poc, pic->data[0]); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3353 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3354 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3355 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3356 } |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3357 |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3358 /** |
| 1168 | 3359 * Executes the reference picture marking (memory management control operations). |
| 3360 */ | |
| 3361 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ | |
| 3362 MpegEncContext * const s = &h->s; | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3363 int i, j; |
| 1168 | 3364 int current_is_long=0; |
| 3365 Picture *pic; | |
| 3366 | |
| 3367 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
|
3368 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n"); |
| 1168 | 3369 |
| 3370 for(i=0; i<mmco_count; i++){ | |
| 3371 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
|
3372 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 | 3373 |
| 3374 switch(mmco[i].opcode){ | |
| 3375 case MMCO_SHORT2UNUSED: | |
| 3376 pic= remove_short(h, mmco[i].short_frame_num); | |
| 3377 if(pic==NULL) return -1; | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3378 unreference_pic(h, pic); |
| 1168 | 3379 break; |
| 3380 case MMCO_SHORT2LONG: | |
| 3381 pic= remove_long(h, mmco[i].long_index); | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3382 if(pic) unreference_pic(h, pic); |
| 1168 | 3383 |
| 3384 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num); | |
| 3385 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
|
2484
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3386 h->long_ref_count++; |
| 1168 | 3387 break; |
| 3388 case MMCO_LONG2UNUSED: | |
| 3389 pic= remove_long(h, mmco[i].long_index); | |
| 3390 if(pic==NULL) return -1; | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3391 unreference_pic(h, pic); |
| 1168 | 3392 break; |
| 3393 case MMCO_LONG: | |
| 3394 pic= remove_long(h, mmco[i].long_index); | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3395 if(pic) unreference_pic(h, pic); |
| 1168 | 3396 |
| 3397 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr; | |
| 3398 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
| 3399 h->long_ref_count++; | |
| 3400 | |
| 3401 current_is_long=1; | |
| 3402 break; | |
| 3403 case MMCO_SET_MAX_LONG: | |
| 3404 assert(mmco[i].long_index <= 16); | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3405 // just remove the long term which index is greater than new max |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3406 for(j = mmco[i].long_index; j<16; j++){ |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3407 pic = remove_long(h, j); |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3408 if (pic) unreference_pic(h, pic); |
| 1168 | 3409 } |
| 3410 break; | |
| 3411 case MMCO_RESET: | |
| 3412 while(h->short_ref_count){ | |
| 3413 pic= remove_short(h, h->short_ref[0]->frame_num); | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3414 unreference_pic(h, pic); |
| 1168 | 3415 } |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3416 for(j = 0; j < 16; j++) { |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3417 pic= remove_long(h, j); |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3418 if(pic) unreference_pic(h, pic); |
| 1168 | 3419 } |
| 3420 break; | |
| 3421 default: assert(0); | |
| 3422 } | |
| 3423 } | |
| 3424 | |
| 3425 if(!current_is_long){ | |
| 3426 pic= remove_short(h, s->current_picture_ptr->frame_num); | |
| 3427 if(pic){ | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3428 unreference_pic(h, pic); |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3429 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n"); |
| 1168 | 3430 } |
| 3431 | |
| 3432 if(h->short_ref_count) | |
| 1169 | 3433 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*)); |
| 3434 | |
| 3435 h->short_ref[0]= s->current_picture_ptr; | |
| 1168 | 3436 h->short_ref[0]->long_ref=0; |
| 3437 h->short_ref_count++; | |
| 3438 } | |
| 3439 | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3440 print_short_term(h); |
|
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
3441 print_long_term(h); |
| 1168 | 3442 return 0; |
| 3443 } | |
| 3444 | |
| 3445 static int decode_ref_pic_marking(H264Context *h){ | |
| 3446 MpegEncContext * const s = &h->s; | |
| 3447 int i; | |
| 3448 | |
| 3449 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields | |
| 3450 s->broken_link= get_bits1(&s->gb) -1; | |
| 3451 h->mmco[0].long_index= get_bits1(&s->gb) - 1; // current_long_term_idx | |
| 3452 if(h->mmco[0].long_index == -1) | |
| 3453 h->mmco_index= 0; | |
| 3454 else{ | |
| 3455 h->mmco[0].opcode= MMCO_LONG; | |
| 3456 h->mmco_index= 1; | |
| 3457 } | |
| 3458 }else{ | |
| 3459 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
|
3460 for(i= 0; i<MAX_MMCO_COUNT; i++) { |
| 1168 | 3461 MMCOOpcode opcode= get_ue_golomb(&s->gb);; |
| 3462 | |
| 3463 h->mmco[i].opcode= opcode; | |
| 3464 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){ | |
| 3465 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 | |
| 3466 /* if(h->mmco[i].short_frame_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_frame_num ] == NULL){ | |
| 3467 fprintf(stderr, "illegal short ref in memory management control operation %d\n", mmco); | |
| 3468 return -1; | |
| 3469 }*/ | |
| 3470 } | |
| 3471 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){ | |
| 3472 h->mmco[i].long_index= get_ue_golomb(&s->gb); | |
| 3473 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
|
3474 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); |
| 1168 | 3475 return -1; |
| 3476 } | |
| 3477 } | |
| 3478 | |
| 3479 if(opcode > MMCO_LONG){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3480 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); |
| 1168 | 3481 return -1; |
| 3482 } | |
|
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
|
3483 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
|
3484 break; |
| 1168 | 3485 } |
| 3486 h->mmco_index= i; | |
| 3487 }else{ | |
| 3488 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count); | |
| 3489 | |
| 3490 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields | |
| 3491 h->mmco[0].opcode= MMCO_SHORT2UNUSED; | |
| 3492 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num; | |
| 3493 h->mmco_index= 1; | |
| 3494 }else | |
| 3495 h->mmco_index= 0; | |
| 3496 } | |
| 3497 } | |
| 3498 | |
| 3499 return 0; | |
| 3500 } | |
| 3501 | |
| 3502 static int init_poc(H264Context *h){ | |
| 3503 MpegEncContext * const s = &h->s; | |
| 3504 const int max_frame_num= 1<<h->sps.log2_max_frame_num; | |
| 3505 int field_poc[2]; | |
| 3506 | |
| 3507 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 3508 h->frame_num_offset= 0; | |
| 3509 }else{ | |
| 3510 if(h->frame_num < h->prev_frame_num) | |
| 3511 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num; | |
| 3512 else | |
| 3513 h->frame_num_offset= h->prev_frame_num_offset; | |
| 3514 } | |
| 3515 | |
| 3516 if(h->sps.poc_type==0){ | |
| 3517 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb; | |
| 3518 | |
| 3519 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2) | |
| 3520 h->poc_msb = h->prev_poc_msb + max_poc_lsb; | |
| 3521 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2) | |
| 3522 h->poc_msb = h->prev_poc_msb - max_poc_lsb; | |
| 3523 else | |
| 3524 h->poc_msb = h->prev_poc_msb; | |
| 3525 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb); | |
| 3526 field_poc[0] = | |
| 3527 field_poc[1] = h->poc_msb + h->poc_lsb; | |
| 3528 if(s->picture_structure == PICT_FRAME) | |
| 3529 field_poc[1] += h->delta_poc_bottom; | |
| 3530 }else if(h->sps.poc_type==1){ | |
| 3531 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc; | |
| 3532 int i; | |
| 3533 | |
| 3534 if(h->sps.poc_cycle_length != 0) | |
| 3535 abs_frame_num = h->frame_num_offset + h->frame_num; | |
| 3536 else | |
| 3537 abs_frame_num = 0; | |
| 3538 | |
| 3539 if(h->nal_ref_idc==0 && abs_frame_num > 0) | |
| 3540 abs_frame_num--; | |
| 3541 | |
| 3542 expected_delta_per_poc_cycle = 0; | |
| 3543 for(i=0; i < h->sps.poc_cycle_length; i++) | |
| 3544 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse | |
| 3545 | |
| 3546 if(abs_frame_num > 0){ | |
| 3547 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length; | |
| 3548 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length; | |
| 3549 | |
| 3550 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle; | |
| 3551 for(i = 0; i <= frame_num_in_poc_cycle; i++) | |
| 3552 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ]; | |
| 3553 } else | |
| 3554 expectedpoc = 0; | |
| 3555 | |
| 3556 if(h->nal_ref_idc == 0) | |
| 3557 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic; | |
| 3558 | |
| 3559 field_poc[0] = expectedpoc + h->delta_poc[0]; | |
| 3560 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field; | |
| 3561 | |
| 3562 if(s->picture_structure == PICT_FRAME) | |
| 3563 field_poc[1] += h->delta_poc[1]; | |
| 3564 }else{ | |
| 3565 int poc; | |
| 3566 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 3567 poc= 0; | |
| 3568 }else{ | |
| 3569 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num); | |
| 3570 else poc= 2*(h->frame_num_offset + h->frame_num) - 1; | |
| 3571 } | |
| 3572 field_poc[0]= poc; | |
| 3573 field_poc[1]= poc; | |
| 3574 } | |
| 3575 | |
| 3576 if(s->picture_structure != PICT_BOTTOM_FIELD) | |
| 3577 s->current_picture_ptr->field_poc[0]= field_poc[0]; | |
| 3578 if(s->picture_structure != PICT_TOP_FIELD) | |
| 3579 s->current_picture_ptr->field_poc[1]= field_poc[1]; | |
| 3580 if(s->picture_structure == PICT_FRAME) // FIXME field pix? | |
| 3581 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]); | |
| 3582 | |
| 3583 return 0; | |
| 3584 } | |
| 3585 | |
| 3586 /** | |
| 3587 * decodes a slice header. | |
| 3588 * this will allso call MPV_common_init() and frame_start() as needed | |
| 3589 */ | |
| 3590 static int decode_slice_header(H264Context *h){ | |
| 3591 MpegEncContext * const s = &h->s; | |
| 3592 int first_mb_in_slice, pps_id; | |
| 3593 int num_ref_idx_active_override_flag; | |
| 3594 static const uint8_t slice_type_map[5]= {P_TYPE, B_TYPE, I_TYPE, SP_TYPE, SI_TYPE}; | |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3595 int slice_type; |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3596 int default_ref_list_done = 0; |
| 1168 | 3597 |
| 3598 s->current_picture.reference= h->nal_ref_idc != 0; | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3599 s->dropable= h->nal_ref_idc == 0; |
| 1168 | 3600 |
| 3601 first_mb_in_slice= get_ue_golomb(&s->gb); | |
| 3602 | |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3603 slice_type= get_ue_golomb(&s->gb); |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3604 if(slice_type > 9){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3605 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 | 3606 return -1; |
| 1168 | 3607 } |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3608 if(slice_type > 4){ |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3609 slice_type -= 5; |
| 1168 | 3610 h->slice_type_fixed=1; |
| 3611 }else | |
| 3612 h->slice_type_fixed=0; | |
| 3613 | |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3614 slice_type= slice_type_map[ slice_type ]; |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3615 if (slice_type == I_TYPE |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3616 || (h->slice_num != 0 && slice_type == h->slice_type) ) { |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3617 default_ref_list_done = 1; |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3618 } |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3619 h->slice_type= slice_type; |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3620 |
| 1168 | 3621 s->pict_type= h->slice_type; // to make a few old func happy, its wrong though |
| 3622 | |
| 3623 pps_id= get_ue_golomb(&s->gb); | |
| 3624 if(pps_id>255){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3625 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n"); |
| 1168 | 3626 return -1; |
| 3627 } | |
| 3628 h->pps= h->pps_buffer[pps_id]; | |
| 1174 | 3629 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
|
3630 av_log(h->s.avctx, AV_LOG_ERROR, "non existing PPS referenced\n"); |
| 1174 | 3631 return -1; |
| 3632 } | |
| 3633 | |
| 1168 | 3634 h->sps= h->sps_buffer[ h->pps.sps_id ]; |
| 1174 | 3635 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
|
3636 av_log(h->s.avctx, AV_LOG_ERROR, "non existing SPS referenced\n"); |
| 1174 | 3637 return -1; |
| 3638 } | |
| 1168 | 3639 |
| 3640 s->mb_width= h->sps.mb_width; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3641 s->mb_height= h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag); |
| 1168 | 3642 |
| 2395 | 3643 h->b_stride= s->mb_width*4 + 1; |
| 3644 h->b8_stride= s->mb_width*2 + 1; | |
| 1168 | 3645 |
| 1371 | 3646 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right ); |
| 1168 | 3647 if(h->sps.frame_mbs_only_flag) |
| 1371 | 3648 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom); |
| 1168 | 3649 else |
| 1371 | 3650 s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck |
| 1168 | 3651 |
| 3652 if (s->context_initialized | |
| 1548 | 3653 && ( s->width != s->avctx->width || s->height != s->avctx->height)) { |
| 1168 | 3654 free_tables(h); |
| 3655 MPV_common_end(s); | |
| 3656 } | |
| 3657 if (!s->context_initialized) { | |
| 3658 if (MPV_common_init(s) < 0) | |
| 3659 return -1; | |
| 3660 | |
| 3661 alloc_tables(h); | |
| 3662 | |
| 3663 s->avctx->width = s->width; | |
| 3664 s->avctx->height = s->height; | |
| 1548 | 3665 s->avctx->sample_aspect_ratio= h->sps.sar; |
| 2440 | 3666 if(!s->avctx->sample_aspect_ratio.den) |
| 3667 s->avctx->sample_aspect_ratio.den = 1; | |
|
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
|
3668 |
|
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
|
3669 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
|
3670 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
|
3671 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
|
3672 } |
| 1168 | 3673 } |
| 3674 | |
| 2392 | 3675 if(h->slice_num == 0){ |
| 1168 | 3676 frame_start(h); |
| 3677 } | |
| 3678 | |
| 1169 | 3679 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup |
| 1168 | 3680 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num); |
| 3681 | |
| 3682 if(h->sps.frame_mbs_only_flag){ | |
| 3683 s->picture_structure= PICT_FRAME; | |
| 3684 }else{ | |
| 3685 if(get_bits1(&s->gb)) //field_pic_flag | |
| 3686 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3687 else { |
| 1168 | 3688 s->picture_structure= PICT_FRAME; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3689 first_mb_in_slice <<= 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3690 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3691 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3692 |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3693 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3694 s->resync_mb_y = s->mb_y = first_mb_in_slice / s->mb_width; //FIXME AFFW |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3695 |
| 1168 | 3696 if(s->picture_structure==PICT_FRAME){ |
| 3697 h->curr_pic_num= h->frame_num; | |
| 3698 h->max_pic_num= 1<< h->sps.log2_max_frame_num; | |
| 3699 }else{ | |
| 3700 h->curr_pic_num= 2*h->frame_num; | |
| 3701 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); | |
| 3702 } | |
| 3703 | |
| 3704 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 1453 | 3705 get_ue_golomb(&s->gb); /* idr_pic_id */ |
| 1168 | 3706 } |
| 3707 | |
| 3708 if(h->sps.poc_type==0){ | |
| 3709 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb); | |
| 3710 | |
| 3711 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){ | |
| 3712 h->delta_poc_bottom= get_se_golomb(&s->gb); | |
| 3713 } | |
| 3714 } | |
| 3715 | |
| 3716 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){ | |
| 3717 h->delta_poc[0]= get_se_golomb(&s->gb); | |
| 3718 | |
| 3719 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME) | |
| 3720 h->delta_poc[1]= get_se_golomb(&s->gb); | |
| 3721 } | |
| 3722 | |
| 3723 init_poc(h); | |
| 3724 | |
| 3725 if(h->pps.redundant_pic_cnt_present){ | |
| 3726 h->redundant_pic_count= get_ue_golomb(&s->gb); | |
| 3727 } | |
| 3728 | |
| 3729 //set defaults, might be overriden a few line later | |
| 3730 h->ref_count[0]= h->pps.ref_count[0]; | |
| 3731 h->ref_count[1]= h->pps.ref_count[1]; | |
| 3732 | |
| 3733 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){ | |
| 3734 if(h->slice_type == B_TYPE){ | |
| 3735 h->direct_spatial_mv_pred= get_bits1(&s->gb); | |
| 3736 } | |
| 3737 num_ref_idx_active_override_flag= get_bits1(&s->gb); | |
| 3738 | |
| 3739 if(num_ref_idx_active_override_flag){ | |
| 3740 h->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
| 3741 if(h->slice_type==B_TYPE) | |
| 3742 h->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
| 3743 | |
| 3744 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
|
3745 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n"); |
| 1168 | 3746 return -1; |
| 3747 } | |
| 3748 } | |
| 3749 } | |
| 3750 | |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
3751 if(!default_ref_list_done){ |
| 1168 | 3752 fill_default_ref_list(h); |
| 3753 } | |
| 3754 | |
| 3755 decode_ref_pic_list_reordering(h); | |
| 3756 | |
| 3757 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE )) | |
| 3758 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) ) | |
| 3759 pred_weight_table(h); | |
| 2415 | 3760 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE) |
| 3761 implicit_weight_table(h); | |
| 3762 else | |
| 3763 h->use_weight = 0; | |
| 1168 | 3764 |
|
2580
b4f6f89ec2f6
The cvs version 1.103 of h264.c brokes 13 conformance streams, this
michael
parents:
2561
diff
changeset
|
3765 if(s->current_picture.reference) |
| 1168 | 3766 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
|
3767 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3768 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
|
3769 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
|
3770 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
3771 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
|
3772 s->qscale = h->pps.init_qp + get_se_golomb(&s->gb); |
| 1898 | 3773 if(s->qscale<0 || s->qscale>51){ |
| 3774 av_log(s->avctx, AV_LOG_ERROR, "QP %d out of range\n", s->qscale); | |
| 3775 return -1; | |
| 3776 } | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
3777 h->chroma_qp = get_chroma_qp(h, s->qscale); |
| 1168 | 3778 //FIXME qscale / qp ... stuff |
| 3779 if(h->slice_type == SP_TYPE){ | |
| 1453 | 3780 get_bits1(&s->gb); /* sp_for_switch_flag */ |
| 1168 | 3781 } |
| 3782 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){ | |
| 1453 | 3783 get_se_golomb(&s->gb); /* slice_qs_delta */ |
| 1168 | 3784 } |
| 3785 | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3786 h->deblocking_filter = 1; |
| 1898 | 3787 h->slice_alpha_c0_offset = 0; |
| 3788 h->slice_beta_offset = 0; | |
| 1168 | 3789 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
|
3790 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
|
3791 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
|
3792 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
|
3793 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3794 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
|
3795 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
|
3796 h->slice_beta_offset = get_se_golomb(&s->gb) << 1; |
| 1168 | 3797 } |
|
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
|
3798 } |
| 1168 | 3799 |
| 3800 #if 0 //FMO | |
| 3801 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5) | |
| 3802 slice_group_change_cycle= get_bits(&s->gb, ?); | |
| 3803 #endif | |
| 3804 | |
| 2392 | 3805 h->slice_num++; |
| 3806 | |
| 1168 | 3807 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3808 av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c pps:%d frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d weight:%d%s\n", |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3809 h->slice_num, |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3810 (s->picture_structure==PICT_FRAME ? "F" : s->picture_structure==PICT_TOP_FIELD ? "T" : "B"), |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3811 first_mb_in_slice, |
| 1264 | 3812 av_get_pict_type_char(h->slice_type), |
| 1168 | 3813 pps_id, h->frame_num, |
| 3814 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], | |
| 3815 h->ref_count[0], h->ref_count[1], | |
| 3816 s->qscale, | |
| 2415 | 3817 h->deblocking_filter, |
| 3818 h->use_weight, | |
| 3819 h->use_weight==1 && h->use_weight_chroma ? "c" : "" | |
| 1168 | 3820 ); |
| 3821 } | |
| 3822 | |
| 3823 return 0; | |
| 3824 } | |
| 3825 | |
| 3826 /** | |
| 3827 * | |
| 3828 */ | |
| 3829 static inline int get_level_prefix(GetBitContext *gb){ | |
| 3830 unsigned int buf; | |
| 3831 int log; | |
| 3832 | |
| 3833 OPEN_READER(re, gb); | |
| 3834 UPDATE_CACHE(re, gb); | |
| 3835 buf=GET_CACHE(re, gb); | |
| 3836 | |
| 3837 log= 32 - av_log2(buf); | |
| 3838 #ifdef TRACE | |
| 3839 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
|
3840 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 | 3841 #endif |
| 3842 | |
| 3843 LAST_SKIP_BITS(re, gb, log); | |
| 3844 CLOSE_READER(re, gb); | |
| 3845 | |
| 3846 return log-1; | |
| 3847 } | |
| 3848 | |
| 3849 /** | |
| 3850 * decodes a residual block. | |
| 3851 * @param n block index | |
| 3852 * @param scantable scantable | |
| 3853 * @param max_coeff number of coefficients in the block | |
| 3854 * @return <0 if an error occured | |
| 3855 */ | |
| 3856 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, int qp, int max_coeff){ | |
| 3857 MpegEncContext * const s = &h->s; | |
| 3858 const uint16_t *qmul= dequant_coeff[qp]; | |
| 3859 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}; | |
| 3860 int level[16], run[16]; | |
| 3861 int suffix_length, zeros_left, coeff_num, coeff_token, total_coeff, i, trailing_ones; | |
| 3862 | |
| 3863 //FIXME put trailing_onex into the context | |
| 3864 | |
| 3865 if(n == CHROMA_DC_BLOCK_INDEX){ | |
| 3866 coeff_token= get_vlc2(gb, chroma_dc_coeff_token_vlc.table, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 1); | |
| 3867 total_coeff= coeff_token>>2; | |
| 3868 }else{ | |
| 3869 if(n == LUMA_DC_BLOCK_INDEX){ | |
| 3870 total_coeff= pred_non_zero_count(h, 0); | |
| 3871 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
| 3872 total_coeff= coeff_token>>2; | |
| 3873 }else{ | |
| 3874 total_coeff= pred_non_zero_count(h, n); | |
| 3875 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
| 3876 total_coeff= coeff_token>>2; | |
| 3877 h->non_zero_count_cache[ scan8[n] ]= total_coeff; | |
| 3878 } | |
| 3879 } | |
| 3880 | |
| 3881 //FIXME set last_non_zero? | |
| 3882 | |
| 3883 if(total_coeff==0) | |
| 3884 return 0; | |
| 3885 | |
| 3886 trailing_ones= coeff_token&3; | |
| 1170 | 3887 tprintf("trailing:%d, total:%d\n", trailing_ones, total_coeff); |
| 1168 | 3888 assert(total_coeff<=16); |
| 3889 | |
| 3890 for(i=0; i<trailing_ones; i++){ | |
| 3891 level[i]= 1 - 2*get_bits1(gb); | |
| 3892 } | |
| 3893 | |
| 3894 suffix_length= total_coeff > 10 && trailing_ones < 3; | |
| 3895 | |
| 3896 for(; i<total_coeff; i++){ | |
| 3897 const int prefix= get_level_prefix(gb); | |
| 3898 int level_code, mask; | |
| 3899 | |
| 3900 if(prefix<14){ //FIXME try to build a large unified VLC table for all this | |
| 3901 if(suffix_length) | |
| 3902 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
| 3903 else | |
| 3904 level_code= (prefix<<suffix_length); //part | |
| 3905 }else if(prefix==14){ | |
| 3906 if(suffix_length) | |
| 3907 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
| 3908 else | |
| 3909 level_code= prefix + get_bits(gb, 4); //part | |
| 3910 }else if(prefix==15){ | |
| 3911 level_code= (prefix<<suffix_length) + get_bits(gb, 12); //part | |
| 3912 if(suffix_length==0) level_code+=15; //FIXME doesnt make (much)sense | |
| 3913 }else{ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3914 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 3915 return -1; |
| 3916 } | |
| 3917 | |
| 3918 if(i==trailing_ones && i<3) level_code+= 2; //FIXME split first iteration | |
| 3919 | |
| 3920 mask= -(level_code&1); | |
| 3921 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
| 3922 | |
| 3923 if(suffix_length==0) suffix_length=1; //FIXME split first iteration | |
| 3924 | |
| 3925 #if 1 | |
| 3926 if(ABS(level[i]) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++; | |
| 3927 #else | |
| 3928 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
|
3929 /* ? == prefix > 2 or sth */ |
| 1168 | 3930 #endif |
| 1170 | 3931 tprintf("level: %d suffix_length:%d\n", level[i], suffix_length); |
| 1168 | 3932 } |
| 3933 | |
| 3934 if(total_coeff == max_coeff) | |
| 3935 zeros_left=0; | |
| 3936 else{ | |
| 3937 if(n == CHROMA_DC_BLOCK_INDEX) | |
| 3938 zeros_left= get_vlc2(gb, chroma_dc_total_zeros_vlc[ total_coeff-1 ].table, CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 1); | |
| 3939 else | |
| 3940 zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1); | |
| 3941 } | |
| 3942 | |
| 3943 for(i=0; i<total_coeff-1; i++){ | |
| 3944 if(zeros_left <=0) | |
| 3945 break; | |
| 3946 else if(zeros_left < 7){ | |
| 3947 run[i]= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
| 3948 }else{ | |
| 3949 run[i]= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
| 3950 } | |
| 3951 zeros_left -= run[i]; | |
| 3952 } | |
| 3953 | |
| 3954 if(zeros_left<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3955 av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 3956 return -1; |
| 3957 } | |
| 3958 | |
| 3959 for(; i<total_coeff-1; i++){ | |
| 3960 run[i]= 0; | |
| 3961 } | |
| 3962 | |
| 3963 run[i]= zeros_left; | |
| 3964 | |
| 3965 coeff_num=-1; | |
| 3966 if(n > 24){ | |
| 3967 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
| 3968 int j; | |
| 3969 | |
| 3970 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
| 3971 j= scantable[ coeff_num ]; | |
| 3972 | |
| 3973 block[j]= level[i]; | |
| 3974 } | |
| 3975 }else{ | |
| 3976 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
| 3977 int j; | |
| 3978 | |
| 3979 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
| 3980 j= scantable[ coeff_num ]; | |
| 3981 | |
| 3982 block[j]= level[i] * qmul[j]; | |
| 3983 // printf("%d %d ", block[j], qmul[j]); | |
| 3984 } | |
| 3985 } | |
| 3986 return 0; | |
| 3987 } | |
| 3988 | |
| 3989 /** | |
| 2396 | 3990 * decodes a P_SKIP or B_SKIP macroblock |
| 3991 */ | |
| 3992 static void decode_mb_skip(H264Context *h){ | |
| 3993 MpegEncContext * const s = &h->s; | |
| 3994 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; | |
| 3995 int mb_type; | |
| 3996 | |
| 3997 memset(h->non_zero_count[mb_xy], 0, 16); | |
| 3998 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui | |
| 3999 | |
| 4000 if( h->slice_type == B_TYPE ) | |
| 4001 { | |
| 4002 // just for fill_caches. pred_direct_motion will set the real mb_type | |
| 4003 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP; | |
| 4004 //FIXME mbaff | |
| 4005 | |
| 2449 | 4006 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
| 2396 | 4007 pred_direct_motion(h, &mb_type); |
| 4008 if(h->pps.cabac){ | |
| 4009 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 4010 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 4011 } | |
| 4012 } | |
| 4013 else | |
| 4014 { | |
| 4015 int mx, my; | |
| 4016 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; | |
| 4017 | |
| 4018 if(h->sps.mb_aff && s->mb_skip_run==0 && (s->mb_y&1)==0){ | |
| 4019 h->mb_field_decoding_flag= get_bits1(&s->gb); | |
| 4020 } | |
| 4021 if(h->mb_field_decoding_flag) | |
| 4022 mb_type|= MB_TYPE_INTERLACED; | |
| 4023 | |
| 2449 | 4024 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
| 2396 | 4025 pred_pskip_motion(h, &mx, &my); |
| 4026 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
| 4027 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); | |
| 4028 if(h->pps.cabac) | |
| 4029 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 4030 } | |
| 4031 | |
| 4032 write_back_motion(h, mb_type); | |
| 4033 s->current_picture.mb_type[mb_xy]= mb_type|MB_TYPE_SKIP; | |
| 4034 s->current_picture.qscale_table[mb_xy]= s->qscale; | |
| 4035 h->slice_table[ mb_xy ]= h->slice_num; | |
| 4036 h->prev_mb_skiped= 1; | |
| 4037 } | |
| 4038 | |
| 4039 /** | |
| 1168 | 4040 * decodes a macroblock |
| 4041 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed | |
| 4042 */ | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4043 static int decode_mb_cavlc(H264Context *h){ |
| 1168 | 4044 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
|
4045 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1169 | 4046 int mb_type, partition_count, cbp; |
| 1168 | 4047 |
| 1252 | 4048 s->dsp.clear_blocks(h->mb); //FIXME avoid if allready clear (move after skip handlong? |
| 1168 | 4049 |
| 1170 | 4050 tprintf("pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
| 1453 | 4051 cbp = 0; /* avoid warning. FIXME: find a solution without slowing |
| 4052 down the code */ | |
| 1168 | 4053 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){ |
| 4054 if(s->mb_skip_run==-1) | |
| 4055 s->mb_skip_run= get_ue_golomb(&s->gb); | |
| 4056 | |
| 4057 if (s->mb_skip_run--) { | |
| 2396 | 4058 decode_mb_skip(h); |
| 1168 | 4059 return 0; |
| 4060 } | |
| 4061 } | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4062 if(h->sps.mb_aff && s->picture_structure==PICT_FRAME ){ |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4063 if ( ((s->mb_y&1) == 0) || h->prev_mb_skiped) |
| 1168 | 4064 h->mb_field_decoding_flag = get_bits1(&s->gb); |
| 4065 }else | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4066 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); |
| 1168 | 4067 |
| 4068 h->prev_mb_skiped= 0; | |
| 4069 | |
| 4070 mb_type= get_ue_golomb(&s->gb); | |
| 4071 if(h->slice_type == B_TYPE){ | |
| 4072 if(mb_type < 23){ | |
| 4073 partition_count= b_mb_type_info[mb_type].partition_count; | |
| 4074 mb_type= b_mb_type_info[mb_type].type; | |
| 4075 }else{ | |
| 4076 mb_type -= 23; | |
| 4077 goto decode_intra_mb; | |
| 4078 } | |
| 4079 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){ | |
| 4080 if(mb_type < 5){ | |
| 4081 partition_count= p_mb_type_info[mb_type].partition_count; | |
| 4082 mb_type= p_mb_type_info[mb_type].type; | |
| 4083 }else{ | |
| 4084 mb_type -= 5; | |
| 4085 goto decode_intra_mb; | |
| 4086 } | |
| 4087 }else{ | |
| 4088 assert(h->slice_type == I_TYPE); | |
| 4089 decode_intra_mb: | |
| 4090 if(mb_type > 25){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4091 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 | 4092 return -1; |
| 4093 } | |
| 4094 partition_count=0; | |
| 4095 cbp= i_mb_type_info[mb_type].cbp; | |
| 4096 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; | |
| 4097 mb_type= i_mb_type_info[mb_type].type; | |
| 4098 } | |
| 4099 | |
| 4100 if(h->mb_field_decoding_flag) | |
| 4101 mb_type |= MB_TYPE_INTERLACED; | |
| 4102 | |
| 4103 s->current_picture.mb_type[mb_xy]= mb_type; | |
| 4104 h->slice_table[ mb_xy ]= h->slice_num; | |
| 4105 | |
| 4106 if(IS_INTRA_PCM(mb_type)){ | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4107 unsigned int x, y; |
| 1168 | 4108 |
| 4109 // we assume these blocks are very rare so we dont optimize it | |
| 4110 align_get_bits(&s->gb); | |
| 4111 | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4112 // The pixels are stored in the same order as levels in h->mb array. |
| 1168 | 4113 for(y=0; y<16; y++){ |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4114 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3); |
| 1168 | 4115 for(x=0; x<16; x++){ |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4116 tprintf("LUMA ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8)); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4117 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= get_bits(&s->gb, 8); |
| 1168 | 4118 } |
| 4119 } | |
| 4120 for(y=0; y<8; y++){ | |
| 4121 const int index= 256 + 4*(y&3) + 32*(y>>2); | |
| 4122 for(x=0; x<8; x++){ | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4123 tprintf("CHROMA U ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8)); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4124 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
| 1168 | 4125 } |
| 4126 } | |
| 4127 for(y=0; y<8; y++){ | |
| 4128 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); | |
| 4129 for(x=0; x<8; x++){ | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4130 tprintf("CHROMA V ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8)); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4131 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
| 1168 | 4132 } |
| 4133 } | |
| 4134 | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4135 // In deblocking, the quantiser is 0 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4136 s->current_picture.qscale_table[mb_xy]= 0; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4137 h->chroma_qp = get_chroma_qp(h, 0); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4138 // All coeffs are presents |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4139 memset(h->non_zero_count[mb_xy], 16, 16); |
| 1168 | 4140 |
| 4141 return 0; | |
| 4142 } | |
| 4143 | |
| 2449 | 4144 fill_caches(h, mb_type, 0); |
| 1168 | 4145 |
| 4146 //mb_pred | |
| 4147 if(IS_INTRA(mb_type)){ | |
| 4148 // init_top_left_availability(h); | |
| 4149 if(IS_INTRA4x4(mb_type)){ | |
| 4150 int i; | |
| 4151 | |
| 4152 // fill_intra4x4_pred_table(h); | |
| 4153 for(i=0; i<16; i++){ | |
| 4154 const int mode_coded= !get_bits1(&s->gb); | |
| 4155 const int predicted_mode= pred_intra_mode(h, i); | |
| 4156 int mode; | |
| 4157 | |
| 4158 if(mode_coded){ | |
| 4159 const int rem_mode= get_bits(&s->gb, 3); | |
| 4160 if(rem_mode<predicted_mode) | |
| 4161 mode= rem_mode; | |
| 4162 else | |
| 4163 mode= rem_mode + 1; | |
| 4164 }else{ | |
| 4165 mode= predicted_mode; | |
| 4166 } | |
| 4167 | |
| 4168 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode; | |
| 4169 } | |
| 4170 write_back_intra_pred_mode(h); | |
| 4171 if( check_intra4x4_pred_mode(h) < 0) | |
| 4172 return -1; | |
| 4173 }else{ | |
| 4174 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode); | |
| 4175 if(h->intra16x16_pred_mode < 0) | |
| 4176 return -1; | |
| 4177 } | |
| 4178 h->chroma_pred_mode= get_ue_golomb(&s->gb); | |
| 4179 | |
| 4180 h->chroma_pred_mode= check_intra_pred_mode(h, h->chroma_pred_mode); | |
| 4181 if(h->chroma_pred_mode < 0) | |
| 4182 return -1; | |
| 4183 }else if(partition_count==4){ | |
| 4184 int i, j, sub_partition_count[4], list, ref[2][4]; | |
| 4185 | |
| 4186 if(h->slice_type == B_TYPE){ | |
| 4187 for(i=0; i<4; i++){ | |
| 4188 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
| 4189 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
|
4190 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 | 4191 return -1; |
| 4192 } | |
| 4193 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
| 4194 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
| 4195 } | |
| 2396 | 4196 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1]) |
| 4197 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) | |
| 4198 pred_direct_motion(h, &mb_type); | |
| 1168 | 4199 }else{ |
| 4200 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ? | |
| 4201 for(i=0; i<4; i++){ | |
| 4202 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
| 4203 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
|
4204 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 | 4205 return -1; |
| 4206 } | |
| 4207 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
| 4208 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
| 4209 } | |
| 4210 } | |
| 4211 | |
| 4212 for(list=0; list<2; list++){ | |
| 4213 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; | |
| 4214 if(ref_count == 0) continue; | |
| 4215 for(i=0; i<4; i++){ | |
| 2396 | 4216 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
| 4217 if(IS_DIR(h->sub_mb_type[i], 0, list)){ | |
| 1168 | 4218 ref[list][i] = get_te0_golomb(&s->gb, ref_count); //FIXME init to 0 before and skip? |
| 4219 }else{ | |
| 4220 //FIXME | |
| 4221 ref[list][i] = -1; | |
| 4222 } | |
| 4223 } | |
| 4224 } | |
| 4225 | |
| 4226 for(list=0; list<2; list++){ | |
| 4227 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; | |
| 4228 if(ref_count == 0) continue; | |
| 4229 | |
| 4230 for(i=0; i<4; i++){ | |
| 2396 | 4231 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
| 1168 | 4232 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]= |
| 4233 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i]; | |
| 4234 | |
| 2396 | 4235 if(IS_DIR(h->sub_mb_type[i], 0, list)){ |
| 1168 | 4236 const int sub_mb_type= h->sub_mb_type[i]; |
| 4237 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1; | |
| 4238 for(j=0; j<sub_partition_count[i]; j++){ | |
| 4239 int mx, my; | |
| 4240 const int index= 4*i + block_width*j; | |
| 4241 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ]; | |
| 4242 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my); | |
| 4243 mx += get_se_golomb(&s->gb); | |
| 4244 my += get_se_golomb(&s->gb); | |
| 1170 | 4245 tprintf("final mv:%d %d\n", mx, my); |
| 4246 | |
| 1168 | 4247 if(IS_SUB_8X8(sub_mb_type)){ |
| 4248 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= | |
| 4249 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; | |
| 4250 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= | |
| 4251 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my; | |
| 4252 }else if(IS_SUB_8X4(sub_mb_type)){ | |
| 4253 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx; | |
| 4254 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my; | |
| 4255 }else if(IS_SUB_4X8(sub_mb_type)){ | |
| 4256 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx; | |
| 4257 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my; | |
| 4258 }else{ | |
| 4259 assert(IS_SUB_4X4(sub_mb_type)); | |
| 4260 mv_cache[ 0 ][0]= mx; | |
| 4261 mv_cache[ 0 ][1]= my; | |
| 4262 } | |
| 4263 } | |
| 4264 }else{ | |
| 4265 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0]; | |
| 4266 p[0] = p[1]= | |
| 4267 p[8] = p[9]= 0; | |
| 4268 } | |
| 4269 } | |
| 4270 } | |
| 2396 | 4271 }else if(IS_DIRECT(mb_type)){ |
| 4272 pred_direct_motion(h, &mb_type); | |
| 4273 s->current_picture.mb_type[mb_xy]= mb_type; | |
| 4274 }else{ | |
| 1168 | 4275 int list, mx, my, i; |
| 4276 //FIXME we should set ref_idx_l? to 0 if we use that later ... | |
| 4277 if(IS_16X16(mb_type)){ | |
| 4278 for(list=0; list<2; list++){ | |
| 2392 | 4279 if(h->ref_count[list]>0){ |
| 1168 | 4280 if(IS_DIR(mb_type, 0, list)){ |
| 4281 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
| 4282 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | |
| 2523 | 4283 }else |
| 4284 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (LIST_NOT_USED&0xFF), 1); | |
| 1168 | 4285 } |
| 4286 } | |
| 4287 for(list=0; list<2; list++){ | |
| 4288 if(IS_DIR(mb_type, 0, list)){ | |
| 4289 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); | |
| 4290 mx += get_se_golomb(&s->gb); | |
| 4291 my += get_se_golomb(&s->gb); | |
| 1170 | 4292 tprintf("final mv:%d %d\n", mx, my); |
| 4293 | |
| 1269 | 4294 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
| 2523 | 4295 }else |
| 4296 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4); | |
| 1168 | 4297 } |
| 4298 } | |
| 4299 else if(IS_16X8(mb_type)){ | |
| 4300 for(list=0; list<2; list++){ | |
| 4301 if(h->ref_count[list]>0){ | |
| 4302 for(i=0; i<2; i++){ | |
| 4303 if(IS_DIR(mb_type, i, list)){ | |
| 4304 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
| 4305 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); | |
| 2523 | 4306 }else |
| 2396 | 4307 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, (LIST_NOT_USED&0xFF), 1); |
| 1168 | 4308 } |
| 4309 } | |
| 4310 } | |
| 4311 for(list=0; list<2; list++){ | |
| 4312 for(i=0; i<2; i++){ | |
| 4313 if(IS_DIR(mb_type, i, list)){ | |
| 4314 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my); | |
| 4315 mx += get_se_golomb(&s->gb); | |
| 4316 my += get_se_golomb(&s->gb); | |
| 1170 | 4317 tprintf("final mv:%d %d\n", mx, my); |
| 4318 | |
| 1269 | 4319 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
| 2396 | 4320 }else |
| 4321 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); | |
| 1168 | 4322 } |
| 4323 } | |
| 4324 }else{ | |
| 4325 assert(IS_8X16(mb_type)); | |
| 4326 for(list=0; list<2; list++){ | |
| 4327 if(h->ref_count[list]>0){ | |
| 4328 for(i=0; i<2; i++){ | |
| 4329 if(IS_DIR(mb_type, i, list)){ //FIXME optimize | |
| 4330 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
| 4331 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); | |
| 2523 | 4332 }else |
| 2396 | 4333 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, (LIST_NOT_USED&0xFF), 1); |
| 1168 | 4334 } |
| 4335 } | |
| 4336 } | |
| 4337 for(list=0; list<2; list++){ | |
| 4338 for(i=0; i<2; i++){ | |
| 4339 if(IS_DIR(mb_type, i, list)){ | |
| 4340 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my); | |
| 4341 mx += get_se_golomb(&s->gb); | |
| 4342 my += get_se_golomb(&s->gb); | |
| 1170 | 4343 tprintf("final mv:%d %d\n", mx, my); |
| 4344 | |
| 1269 | 4345 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
| 2396 | 4346 }else |
| 4347 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); | |
| 1168 | 4348 } |
| 4349 } | |
| 4350 } | |
| 4351 } | |
| 4352 | |
| 4353 if(IS_INTER(mb_type)) | |
| 4354 write_back_motion(h, mb_type); | |
| 4355 | |
| 4356 if(!IS_INTRA16x16(mb_type)){ | |
| 4357 cbp= get_ue_golomb(&s->gb); | |
| 4358 if(cbp > 47){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4359 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%d) at %d %d\n", cbp, s->mb_x, s->mb_y); |
| 1168 | 4360 return -1; |
| 4361 } | |
| 4362 | |
| 4363 if(IS_INTRA4x4(mb_type)) | |
| 4364 cbp= golomb_to_intra4x4_cbp[cbp]; | |
| 4365 else | |
| 4366 cbp= golomb_to_inter_cbp[cbp]; | |
| 4367 } | |
| 4368 | |
| 4369 if(cbp || IS_INTRA16x16(mb_type)){ | |
| 4370 int i8x8, i4x4, chroma_idx; | |
| 4371 int chroma_qp, dquant; | |
| 4372 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr; | |
| 4373 const uint8_t *scan, *dc_scan; | |
| 4374 | |
| 4375 // fill_non_zero_count_cache(h); | |
| 4376 | |
| 4377 if(IS_INTERLACED(mb_type)){ | |
| 4378 scan= field_scan; | |
| 4379 dc_scan= luma_dc_field_scan; | |
| 4380 }else{ | |
| 4381 scan= zigzag_scan; | |
| 4382 dc_scan= luma_dc_zigzag_scan; | |
| 4383 } | |
| 4384 | |
| 4385 dquant= get_se_golomb(&s->gb); | |
| 4386 | |
| 4387 if( dquant > 25 || dquant < -26 ){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4388 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 | 4389 return -1; |
| 4390 } | |
| 4391 | |
| 4392 s->qscale += dquant; | |
| 4393 if(((unsigned)s->qscale) > 51){ | |
| 4394 if(s->qscale<0) s->qscale+= 52; | |
| 4395 else s->qscale-= 52; | |
| 4396 } | |
| 4397 | |
| 4398 h->chroma_qp= chroma_qp= get_chroma_qp(h, s->qscale); | |
| 4399 if(IS_INTRA16x16(mb_type)){ | |
| 4400 if( decode_residual(h, h->intra_gb_ptr, h->mb, LUMA_DC_BLOCK_INDEX, dc_scan, s->qscale, 16) < 0){ | |
| 4401 return -1; //FIXME continue if partotioned and other retirn -1 too | |
| 4402 } | |
| 4403 | |
| 4404 assert((cbp&15) == 0 || (cbp&15) == 15); | |
| 4405 | |
| 4406 if(cbp&15){ | |
| 4407 for(i8x8=0; i8x8<4; i8x8++){ | |
| 4408 for(i4x4=0; i4x4<4; i4x4++){ | |
| 4409 const int index= i4x4 + 4*i8x8; | |
| 4410 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, s->qscale, 15) < 0 ){ | |
| 4411 return -1; | |
| 4412 } | |
| 4413 } | |
| 4414 } | |
| 4415 }else{ | |
| 1636 | 4416 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1); |
| 1168 | 4417 } |
| 4418 }else{ | |
| 4419 for(i8x8=0; i8x8<4; i8x8++){ | |
| 4420 if(cbp & (1<<i8x8)){ | |
| 4421 for(i4x4=0; i4x4<4; i4x4++){ | |
| 4422 const int index= i4x4 + 4*i8x8; | |
| 4423 | |
| 4424 if( decode_residual(h, gb, h->mb + 16*index, index, scan, s->qscale, 16) <0 ){ | |
| 4425 return -1; | |
| 4426 } | |
| 4427 } | |
| 4428 }else{ | |
| 4429 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; | |
| 4430 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; | |
| 4431 } | |
| 4432 } | |
| 4433 } | |
| 4434 | |
| 4435 if(cbp&0x30){ | |
| 4436 for(chroma_idx=0; chroma_idx<2; chroma_idx++) | |
| 4437 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, chroma_qp, 4) < 0){ | |
| 4438 return -1; | |
| 4439 } | |
| 4440 } | |
| 4441 | |
| 4442 if(cbp&0x20){ | |
| 4443 for(chroma_idx=0; chroma_idx<2; chroma_idx++){ | |
| 4444 for(i4x4=0; i4x4<4; i4x4++){ | |
| 4445 const int index= 16 + 4*chroma_idx + i4x4; | |
| 4446 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, chroma_qp, 15) < 0){ | |
| 4447 return -1; | |
| 4448 } | |
| 4449 } | |
| 4450 } | |
| 4451 }else{ | |
| 4452 uint8_t * const nnz= &h->non_zero_count_cache[0]; | |
| 4453 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
| 4454 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
| 4455 } | |
| 4456 }else{ | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4457 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
|
4458 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
|
4459 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
|
4460 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; |
| 1168 | 4461 } |
|
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
|
4462 s->current_picture.qscale_table[mb_xy]= s->qscale; |
| 1168 | 4463 write_back_non_zero_count(h); |
| 4464 | |
| 4465 return 0; | |
| 4466 } | |
| 4467 | |
| 2312 | 4468 static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_slice) { |
| 4469 uint8_t *state= &h->cabac_state[ctx_base]; | |
| 4470 int mb_type; | |
| 4471 | |
| 4472 if(intra_slice){ | |
| 4473 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
|
4474 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4475 const int mba_xy = mb_xy - 1; |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4476 const int mbb_xy = mb_xy - s->mb_stride; |
| 2312 | 4477 int ctx=0; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4478 if( h->slice_table[mba_xy] == h->slice_num && !IS_INTRA4x4( s->current_picture.mb_type[mba_xy] ) ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4479 ctx++; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4480 if( h->slice_table[mbb_xy] == h->slice_num && !IS_INTRA4x4( s->current_picture.mb_type[mbb_xy] ) ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4481 ctx++; |
| 2312 | 4482 if( get_cabac( &h->cabac, &state[ctx] ) == 0 ) |
| 4483 return 0; /* I4x4 */ | |
| 4484 state += 2; | |
| 4485 }else{ | |
| 4486 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
|
4487 return 0; /* I4x4 */ |
| 2312 | 4488 } |
| 4489 | |
| 4490 if( get_cabac_terminate( &h->cabac ) ) | |
| 4491 return 25; /* PCM */ | |
| 4492 | |
| 4493 mb_type = 1; /* I16x16 */ | |
| 4494 if( get_cabac( &h->cabac, &state[1] ) ) | |
| 4495 mb_type += 12; /* cbp_luma != 0 */ | |
| 4496 | |
| 4497 if( get_cabac( &h->cabac, &state[2] ) ) { | |
| 4498 if( get_cabac( &h->cabac, &state[2+intra_slice] ) ) | |
| 4499 mb_type += 4 * 2; /* cbp_chroma == 2 */ | |
| 4500 else | |
| 4501 mb_type += 4 * 1; /* cbp_chroma == 1 */ | |
| 4502 } | |
| 4503 if( get_cabac( &h->cabac, &state[3+intra_slice] ) ) | |
| 4504 mb_type += 2; | |
| 4505 if( get_cabac( &h->cabac, &state[3+2*intra_slice] ) ) | |
| 4506 mb_type += 1; | |
| 4507 return mb_type; | |
| 4508 } | |
| 4509 | |
| 4510 static int decode_cabac_mb_type( H264Context *h ) { | |
| 4511 MpegEncContext * const s = &h->s; | |
| 4512 | |
| 4513 if( h->slice_type == I_TYPE ) { | |
| 4514 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
|
4515 } 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
|
4516 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
|
4517 /* 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
|
4518 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
|
4519 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
|
4520 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
|
4521 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4522 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
|
4523 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4524 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
|
4525 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
|
4526 else |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4527 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
|
4528 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4529 } else { |
| 2312 | 4530 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
|
4531 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4532 } 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
|
4533 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4534 const int mba_xy = mb_xy - 1; |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4535 const int mbb_xy = mb_xy - s->mb_stride; |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4536 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
|
4537 int bits; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4538 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4539 if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mba_xy] ) |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4540 && !IS_DIRECT( s->current_picture.mb_type[mba_xy] ) ) |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4541 ctx++; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4542 if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mbb_xy] ) |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4543 && !IS_DIRECT( s->current_picture.mb_type[mbb_xy] ) ) |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4544 ctx++; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4545 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4546 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
|
4547 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
|
4548 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4549 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
|
4550 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
|
4551 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4552 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4553 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
|
4554 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
|
4555 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
|
4556 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
|
4557 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
|
4558 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
|
4559 else if( bits == 13 ) { |
| 2312 | 4560 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
|
4561 } 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
|
4562 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
|
4563 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
|
4564 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
|
4565 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4566 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
|
4567 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
|
4568 } else { |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4569 /* 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
|
4570 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
|
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 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4573 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4574 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
|
4575 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
|
4576 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
|
4577 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
|
4578 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
|
4579 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
|
4580 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4581 if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mba_xy] )) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4582 ctx++; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4583 if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mbb_xy] )) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4584 ctx++; |
|
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 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
|
4587 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
|
4588 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
|
4589 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
|
4590 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4591 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4592 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
|
4593 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
|
4594 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4595 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
|
4596 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
|
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 if( get_cabac( &h->cabac, &h->cabac_state[69] ) ) |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4599 mode += 1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4600 if( 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
|
4601 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
|
4602 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
|
4603 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
|
4604 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
|
4605 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
|
4606 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4607 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
|
4608 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4609 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4610 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
|
4611 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
|
4612 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
|
4613 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
|
4614 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
|
4615 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4616 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
|
4617 |
|
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
|
4618 /* No need to test for IS_INTRA4x4 and IS_INTRA16x16, as we set chroma_pred_mode_table to 0 */ |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4619 if( h->slice_table[mba_xy] == h->slice_num && h->chroma_pred_mode_table[mba_xy] != 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4620 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
|
4621 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4622 if( h->slice_table[mbb_xy] == h->slice_num && h->chroma_pred_mode_table[mbb_xy] != 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4623 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4624 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4625 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
|
4626 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
|
4627 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4628 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
|
4629 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
|
4630 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
|
4631 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
|
4632 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4633 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
|
4634 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4635 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4636 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
|
4637 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
|
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 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
|
4640 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
|
4641 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4642 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
|
4643 { 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
|
4644 { 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
|
4645 { 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
|
4646 { 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
|
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 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
|
4650 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
|
4651 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
|
4652 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4653 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
|
4654 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
|
4655 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4656 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
|
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 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
|
4659 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
|
4660 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
|
4661 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
|
4662 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
|
4663 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4664 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
|
4665 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
|
4666 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4667 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
|
4668 mba_xy = mb_xy; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4669 else if( s->mb_x > 0 ) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4670 mba_xy = mb_xy - 1; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4671 if (h->slice_table[mba_xy] != h->slice_num) { |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4672 mba_xy = -1; |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4673 } |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4674 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4675 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4676 if( 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
|
4677 mbb_xy = mb_xy; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4678 else if( s->mb_y > 0 ) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4679 mbb_xy = mb_xy - s->mb_stride; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4680 if (h->slice_table[mbb_xy] != h->slice_num) { |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4681 mbb_xy = -1; |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4682 } |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4683 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4684 |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
4685 /* No need to test for skip as we put 0 for skip block */ |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4686 /* No need to test for IPCM as we put 1 for IPCM block */ |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4687 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
|
4688 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
|
4689 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
|
4690 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4691 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4692 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4693 if( 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
|
4694 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
|
4695 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
|
4696 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
|
4697 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4698 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4699 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
|
4700 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
|
4701 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
|
4702 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4703 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4704 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
|
4705 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4706 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
|
4707 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
|
4708 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
|
4709 |
| 2314 | 4710 cbp_a = (h->left_cbp>>4)&0x03; |
| 4711 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
|
4712 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4713 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
|
4714 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
|
4715 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
|
4716 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
|
4717 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
|
4718 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4719 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
|
4720 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
|
4721 if( cbp_b == 2 ) ctx += 2; |
| 2314 | 4722 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
|
4723 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4724 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
|
4725 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
|
4726 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
|
4727 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
|
4728 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
|
4729 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4730 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
|
4731 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
|
4732 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4733 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
|
4734 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4735 if( h->last_qscale_diff != 0 && ( IS_INTRA16x16(s->current_picture.mb_type[mbn_xy] ) || (h->cbp_table[mbn_xy]&0x3f) ) ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4736 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4737 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4738 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
|
4739 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
|
4740 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
|
4741 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4742 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
|
4743 val++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4744 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4745 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4746 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
|
4747 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
|
4748 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4749 return -(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
|
4750 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4751 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
|
4752 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
|
4753 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
|
4754 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
|
4755 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
|
4756 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
|
4757 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
|
4758 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
|
4759 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4760 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
|
4761 int type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4762 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
|
4763 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
|
4764 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
|
4765 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
|
4766 type = 3; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4767 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
|
4768 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
|
4769 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
|
4770 type += 4; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4771 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4772 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
|
4773 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
|
4774 return type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
4775 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4776 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4777 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
|
4778 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
|
4779 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
|
4780 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
|
4781 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
|
4782 |
| 2396 | 4783 if( h->slice_type == B_TYPE) { |
| 4784 if( refa > 0 && !h->direct_cache[scan8[n] - 1] ) | |
| 4785 ctx++; | |
| 4786 if( refb > 0 && !h->direct_cache[scan8[n] - 8] ) | |
| 4787 ctx += 2; | |
| 4788 } else { | |
| 4789 if( refa > 0 ) | |
| 4790 ctx++; | |
| 4791 if( refb > 0 ) | |
| 4792 ctx += 2; | |
| 4793 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4794 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4795 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
|
4796 ref++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4797 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
|
4798 ctx = 4; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4799 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4800 ctx = 5; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4801 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4802 return ref; |
|
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 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
|
4806 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
|
4807 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
|
4808 int ctxbase = (l == 0) ? 40 : 47; |
| 2317 | 4809 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
|
4810 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4811 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
|
4812 ctx = 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4813 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
|
4814 ctx = 2; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4815 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4816 ctx = 1; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4817 |
| 2317 | 4818 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx])) |
| 4819 return 0; | |
| 4820 | |
| 4821 mvd= 1; | |
| 4822 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
|
4823 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
|
4824 mvd++; |
| 2317 | 4825 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
|
4826 ctx++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4827 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4828 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4829 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
|
4830 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
|
4831 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
|
4832 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
|
4833 k++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4834 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4835 while( k-- ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4836 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
|
4837 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
|
4838 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4839 } |
| 2317 | 4840 if( get_cabac_bypass( &h->cabac ) ) return -mvd; |
| 4841 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
|
4842 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
4843 |
| 2316 | 4844 static int inline get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { |
| 2314 | 4845 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
|
4846 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
|
4847 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4848 if( cat == 0 ) { |
| 2314 | 4849 nza = h->left_cbp&0x100; |
| 4850 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
|
4851 } else if( cat == 1 || cat == 2 ) { |
| 2314 | 4852 nza = h->non_zero_count_cache[scan8[idx] - 1]; |
| 4853 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
|
4854 } else if( cat == 3 ) { |
| 2314 | 4855 nza = (h->left_cbp>>(6+idx))&0x01; |
| 4856 nzb = (h-> top_cbp>>(6+idx))&0x01; | |
| 4857 } else { | |
| 4858 assert(cat == 4); | |
| 4859 nza = h->non_zero_count_cache[scan8[16+idx] - 1]; | |
| 4860 nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; | |
| 4861 } | |
| 4862 | |
| 4863 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
|
4864 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4865 |
| 2314 | 4866 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
|
4867 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
|
4868 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4869 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
|
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 |
| 2316 | 4872 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
|
4873 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
|
4874 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
|
4875 static const int significant_coeff_flag_offset[5] = { 0, 15, 29, 44, 47 }; |
| 2313 | 4876 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
|
4877 |
| 2313 | 4878 int index[16]; |
| 4879 | |
| 4880 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
|
4881 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
|
4882 |
| 2316 | 4883 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
|
4884 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
|
4885 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4886 /* 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
|
4887 * 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
|
4888 * 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
|
4889 * 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
|
4890 * 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
|
4891 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4892 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4893 /* 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
|
4894 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
|
4895 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
|
4896 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
|
4897 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
|
4898 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
|
4899 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4900 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
|
4901 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4902 |
| 2313 | 4903 for(last= 0; last < max_coeff - 1; last++) { |
| 4904 if( get_cabac( &h->cabac, &h->cabac_state[105+significant_coeff_flag_offset[cat]+last] )) { | |
| 4905 index[coeff_count++] = last; | |
| 4906 if( get_cabac( &h->cabac, &h->cabac_state[166+significant_coeff_flag_offset[cat]+last] ) ) { | |
| 4907 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
|
4908 break; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4909 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4910 } |
|
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 if( last == max_coeff -1 ) { |
| 2313 | 4913 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
|
4914 } |
| 2316 | 4915 assert(coeff_count > 0); |
| 4916 | |
| 4917 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
|
4918 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
|
4919 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
|
4920 h->non_zero_count_cache[scan8[n]] = coeff_count; |
| 2316 | 4921 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
|
4922 h->cbp_table[mb_xy] |= 0x40 << n; |
| 2316 | 4923 else { |
| 4924 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
|
4925 h->non_zero_count_cache[scan8[16+n]] = coeff_count; |
| 2316 | 4926 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4927 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4928 for( i = coeff_count - 1; i >= 0; i-- ) { |
| 2316 | 4929 int ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + coeff_abs_level_m1_offset[cat]; |
| 4930 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
|
4931 |
| 2313 | 4932 if( get_cabac( &h->cabac, &h->cabac_state[ctx] ) == 0 ) { |
| 2316 | 4933 if( cat == 0 || cat == 3 ) { |
| 4934 if( get_cabac_bypass( &h->cabac ) ) block[j] = -1; | |
| 4935 else block[j] = 1; | |
| 4936 }else{ | |
| 4937 if( get_cabac_bypass( &h->cabac ) ) block[j] = -qmul[j]; | |
| 4938 else block[j] = qmul[j]; | |
| 4939 } | |
| 2313 | 4940 |
| 4941 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
|
4942 } else { |
| 2313 | 4943 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
|
4944 ctx = 5 + FFMIN( 4, abslevelgt1 ) + coeff_abs_level_m1_offset[cat]; |
| 2313 | 4945 while( coeff_abs < 15 && get_cabac( &h->cabac, &h->cabac_state[ctx] ) ) { |
| 4946 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
|
4947 } |
| 2313 | 4948 |
| 4949 if( coeff_abs >= 15 ) { | |
| 4950 int j = 0; | |
| 4951 while( get_cabac_bypass( &h->cabac ) ) { | |
| 4952 coeff_abs += 1 << j; | |
| 4953 j++; | |
| 4954 } | |
| 4955 | |
| 4956 while( j-- ) { | |
| 4957 if( get_cabac_bypass( &h->cabac ) ) | |
| 4958 coeff_abs += 1 << j ; | |
| 4959 } | |
| 4960 } | |
| 4961 | |
| 2316 | 4962 if( cat == 0 || cat == 3 ) { |
| 4963 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs; | |
| 4964 else block[j] = coeff_abs; | |
| 4965 }else{ | |
| 4966 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs * qmul[j]; | |
| 4967 else block[j] = coeff_abs * qmul[j]; | |
| 4968 } | |
| 2313 | 4969 |
| 4970 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
|
4971 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4972 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4973 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
|
4974 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4975 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4976 /** |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4977 * 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
|
4978 * @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
|
4979 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4980 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
|
4981 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
|
4982 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
|
4983 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
|
4984 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4985 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
|
4986 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4987 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
|
4988 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
|
4989 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
|
4990 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4991 |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
4992 tprintf("pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4993 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
|
4994 /* 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
|
4995 if( decode_cabac_mb_skip( h ) ) { |
| 2396 | 4996 decode_mb_skip(h); |
| 4997 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4998 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
|
4999 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
|
5000 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
|
5001 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5002 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
|
5003 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5004 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5005 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5006 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
|
5007 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5008 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
|
5009 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
|
5010 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
|
5011 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5012 |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5013 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
|
5014 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
|
5015 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
|
5016 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
|
5017 }else{ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5018 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
|
5019 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
|
5020 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5021 } 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
|
5022 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
|
5023 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
|
5024 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
|
5025 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5026 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
|
5027 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
|
5028 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5029 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5030 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
|
5031 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
|
5032 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
|
5033 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
|
5034 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
|
5035 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
|
5036 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5037 #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
|
5038 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
|
5039 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
|
5040 #endif |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5041 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5042 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
|
5043 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
|
5044 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5045 if(IS_INTRA_PCM(mb_type)) { |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5046 const uint8_t *ptr; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5047 unsigned int x, y; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5048 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5049 // We assume these blocks are very rare so we dont optimize it. |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5050 // FIXME The two following lines get the bitstream position in the cabac |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5051 // decode, I think it should be done by a function in cabac.h (or cabac.c). |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5052 ptr= h->cabac.bytestream; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5053 if (h->cabac.low&0x1) ptr-=CABAC_BITS/8; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5054 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5055 // The pixels are stored in the same order as levels in h->mb array. |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5056 for(y=0; y<16; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5057 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5058 for(x=0; x<16; x++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5059 tprintf("LUMA ICPM LEVEL (%3d)\n", *ptr); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5060 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= *ptr++; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5061 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5062 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5063 for(y=0; y<8; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5064 const int index= 256 + 4*(y&3) + 32*(y>>2); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5065 for(x=0; x<8; x++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5066 tprintf("CHROMA U ICPM LEVEL (%3d)\n", *ptr); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5067 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5068 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5069 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5070 for(y=0; y<8; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5071 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5072 for(x=0; x<8; x++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5073 tprintf("CHROMA V ICPM LEVEL (%3d)\n", *ptr); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5074 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5075 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5076 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5077 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5078 ff_init_cabac_decoder(&h->cabac, ptr, h->cabac.bytestream_end - ptr); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5079 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5080 // All blocks are presents |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5081 h->cbp_table[mb_xy] = 0x1ef; |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
5082 h->chroma_pred_mode_table[mb_xy] = 0; |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5083 // In deblocking, the quantiser is 0 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5084 s->current_picture.qscale_table[mb_xy]= 0; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5085 h->chroma_qp = get_chroma_qp(h, 0); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5086 // All coeffs are presents |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5087 memset(h->non_zero_count[mb_xy], 16, 16); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5088 return 0; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5089 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5090 |
| 2449 | 5091 fill_caches(h, mb_type, 0); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5092 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5093 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
|
5094 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
|
5095 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
|
5096 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
|
5097 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
|
5098 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
|
5099 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5100 //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
|
5101 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5102 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
|
5103 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
|
5104 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5105 h->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
|
5106 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
|
5107 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5108 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
|
5109 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
|
5110 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5111 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
|
5112 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
|
5113 } 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
|
5114 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
|
5115 |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5116 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
|
5117 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
|
5118 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
|
5119 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
|
5120 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
|
5121 } |
| 2396 | 5122 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1]) |
| 5123 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) { | |
| 5124 pred_direct_motion(h, &mb_type); | |
| 5125 if( h->ref_count[0] > 1 || h->ref_count[1] > 1 ) { | |
| 5126 for( i = 0; i < 4; i++ ) | |
| 5127 if( IS_DIRECT(h->sub_mb_type[i]) ) | |
| 5128 fill_rectangle( &h->direct_cache[scan8[4*i]], 2, 2, 8, 1, 1 ); | |
| 5129 } | |
| 5130 } | |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5131 } else { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5132 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
|
5133 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
|
5134 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
|
5135 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
|
5136 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5137 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5138 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5139 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
|
5140 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
|
5141 for( i = 0; i < 4; i++ ) { |
| 2396 | 5142 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
| 5143 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
|
5144 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
|
5145 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
|
5146 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5147 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
|
5148 } else { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5149 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
|
5150 } |
| 2110 | 5151 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
|
5152 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
|
5153 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5154 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5155 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5156 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5157 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
|
5158 for(i=0; i<4; i++){ |
| 2396 | 5159 if(IS_DIRECT(h->sub_mb_type[i])){ |
| 5160 fill_rectangle(h->mvd_cache[list][scan8[4*i]], 2, 2, 8, 0, 4); | |
| 5161 continue; | |
| 5162 } | |
| 2110 | 5163 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
|
5164 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5165 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
|
5166 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
|
5167 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
|
5168 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
|
5169 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
|
5170 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
|
5171 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
|
5172 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
|
5173 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
|
5174 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
|
5175 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5176 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
|
5177 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
|
5178 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
|
5179 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5180 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
|
5181 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
|
5182 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
|
5183 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
|
5184 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
|
5185 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5186 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
|
5187 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
|
5188 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
|
5189 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
|
5190 }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
|
5191 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
|
5192 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
|
5193 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5194 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
|
5195 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
|
5196 }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
|
5197 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
|
5198 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
|
5199 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5200 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
|
5201 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
|
5202 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5203 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
|
5204 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
|
5205 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
|
5206 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5207 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
|
5208 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
|
5209 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5210 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5211 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5212 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
|
5213 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
|
5214 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
|
5215 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
|
5216 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5217 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5218 } |
| 2396 | 5219 } else if( IS_DIRECT(mb_type) ) { |
| 5220 pred_direct_motion(h, &mb_type); | |
| 5221 s->current_picture.mb_type[mb_xy]= mb_type; | |
| 5222 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 5223 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 5224 } else { | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5225 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
|
5226 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
|
5227 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
|
5228 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
|
5229 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
|
5230 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
|
5231 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
|
5232 } |
| 2523 | 5233 }else |
| 5234 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1); | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5235 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5236 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
|
5237 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
|
5238 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
|
5239 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5240 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
|
5241 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
|
5242 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
|
5243 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5244 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
|
5245 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
| 2523 | 5246 }else |
| 5247 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4); | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5248 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5249 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5250 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
|
5251 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
|
5252 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
|
5253 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
|
5254 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
|
5255 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
|
5256 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, ref, 1); |
| 2396 | 5257 }else |
| 5258 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
|
5259 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5260 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5261 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5262 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
|
5263 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
|
5264 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
|
5265 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
|
5266 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
|
5267 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
|
5268 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
|
5269 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5270 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
|
5271 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
| 2523 | 5272 }else{ |
| 2396 | 5273 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); |
| 5274 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
|
5275 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5276 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5277 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5278 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5279 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
|
5280 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
|
5281 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
|
5282 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
|
5283 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
|
5284 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
|
5285 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, ref, 1); |
| 2396 | 5286 }else |
| 5287 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
|
5288 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5289 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5290 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5291 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
|
5292 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
|
5293 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
|
5294 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
|
5295 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
|
5296 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
|
5297 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5298 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
|
5299 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
|
5300 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
| 2523 | 5301 }else{ |
| 2396 | 5302 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); |
| 5303 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
|
5304 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5305 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5306 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5307 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5308 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5309 |
|
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
|
5310 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
|
5311 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
|
5312 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
|
5313 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5314 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5315 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
|
5316 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
|
5317 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
|
5318 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5319 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5320 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
|
5321 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5322 if( 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
|
5323 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
|
5324 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
|
5325 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5326 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
|
5327 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
|
5328 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
|
5329 }else{ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5330 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
|
5331 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
|
5332 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5333 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5334 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
|
5335 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
|
5336 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
|
5337 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
|
5338 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
|
5339 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5340 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
|
5341 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5342 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
|
5343 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
|
5344 //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
|
5345 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
|
5346 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
|
5347 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
|
5348 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
|
5349 //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
|
5350 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
|
5351 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
|
5352 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5353 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5354 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
|
5355 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5356 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5357 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
|
5358 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
|
5359 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
|
5360 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
|
5361 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
|
5362 //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
|
5363 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
|
5364 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
|
5365 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5366 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5367 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
|
5368 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
|
5369 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5370 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5371 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5372 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5373 if( 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
|
5374 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
|
5375 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
|
5376 //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
|
5377 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
|
5378 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
|
5379 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5380 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5381 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5382 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
|
5383 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
|
5384 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
|
5385 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
|
5386 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
|
5387 //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
|
5388 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
|
5389 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
|
5390 } |
|
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 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5393 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
|
5394 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
|
5395 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
|
5396 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5397 } else { |
| 2315 | 5398 uint8_t * const nnz= &h->non_zero_count_cache[0]; |
| 5399 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1); | |
| 5400 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
| 5401 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
|
5402 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5403 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5404 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
|
5405 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
|
5406 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5407 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
|
5408 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5409 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5410 |
|
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
|
5411 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
|
5412 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
|
5413 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
|
5414 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
|
5415 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
|
5416 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5417 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
|
5418 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
|
5419 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
|
5420 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
|
5421 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5422 |
| 1898 | 5423 if( bS[i] < 4 ) { |
| 5424 const int tc0 = tc0_table[index_a][bS[i] - 1]; | |
| 5425 /* 4px edge length */ | |
| 5426 for( d = 0; d < 4; d++ ) { | |
| 5427 const int p0 = pix[-1]; | |
| 5428 const int p1 = pix[-2]; | |
| 5429 const int p2 = pix[-3]; | |
| 5430 const int q0 = pix[0]; | |
| 5431 const int q1 = pix[1]; | |
| 5432 const int q2 = pix[2]; | |
| 5433 | |
| 5434 if( ABS( p0 - q0 ) < alpha && | |
| 5435 ABS( p1 - p0 ) < beta && | |
| 5436 ABS( q1 - q0 ) < beta ) { | |
| 5437 int tc = tc0; | |
| 5438 int i_delta; | |
| 5439 | |
| 5440 if( ABS( p2 - p0 ) < beta ) { | |
| 5441 pix[-2] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); | |
| 5442 tc++; | |
| 5443 } | |
| 5444 if( ABS( q2 - q0 ) < beta ) { | |
| 5445 pix[1] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); | |
| 5446 tc++; | |
| 5447 } | |
| 5448 | |
| 5449 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
| 5450 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ | |
| 5451 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
|
5452 } |
| 1898 | 5453 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
|
5454 } |
| 1898 | 5455 }else{ |
| 5456 /* 4px edge length */ | |
| 5457 for( d = 0; d < 4; d++ ) { | |
| 5458 const int p0 = pix[-1]; | |
| 5459 const int p1 = pix[-2]; | |
| 5460 const int p2 = pix[-3]; | |
| 5461 | |
| 5462 const int q0 = pix[0]; | |
| 5463 const int q1 = pix[1]; | |
| 5464 const int q2 = pix[2]; | |
| 5465 | |
| 5466 if( ABS( p0 - q0 ) < alpha && | |
| 5467 ABS( p1 - p0 ) < beta && | |
| 5468 ABS( q1 - q0 ) < beta ) { | |
| 5469 | |
| 5470 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
| 5471 if( ABS( p2 - p0 ) < beta) | |
| 5472 { | |
| 5473 const int p3 = pix[-4]; | |
| 5474 /* p0', p1', p2' */ | |
| 5475 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
| 5476 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
| 5477 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
| 5478 } else { | |
| 5479 /* p0' */ | |
| 5480 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 5481 } | |
| 5482 if( ABS( q2 - q0 ) < beta) | |
| 5483 { | |
| 5484 const int q3 = pix[3]; | |
| 5485 /* q0', q1', q2' */ | |
| 5486 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
| 5487 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
| 5488 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
| 5489 } else { | |
| 5490 /* q0' */ | |
| 5491 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 5492 } | |
| 5493 }else{ | |
| 5494 /* p0', q0' */ | |
| 5495 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 5496 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 5497 } | |
|
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
|
5498 } |
| 1898 | 5499 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
|
5500 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5501 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5502 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5503 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5504 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
|
5505 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
|
5506 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
|
5507 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
|
5508 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
|
5509 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5510 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
|
5511 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
|
5512 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
|
5513 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
|
5514 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5515 |
| 1898 | 5516 if( bS[i] < 4 ) { |
| 5517 const int tc = tc0_table[index_a][bS[i] - 1] + 1; | |
| 5518 /* 2px edge length (because we use same bS than the one for luma) */ | |
| 5519 for( d = 0; d < 2; d++ ){ | |
| 5520 const int p0 = pix[-1]; | |
| 5521 const int p1 = pix[-2]; | |
| 5522 const int q0 = pix[0]; | |
| 5523 const int q1 = pix[1]; | |
| 5524 | |
| 5525 if( ABS( p0 - q0 ) < alpha && | |
| 5526 ABS( p1 - p0 ) < beta && | |
| 5527 ABS( q1 - q0 ) < beta ) { | |
| 5528 const int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
| 5529 | |
| 5530 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ | |
| 5531 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
5532 //tprintf("filter_mb_edgecv i:%d d:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, qp, index_a, alpha, beta, tc, bS[i], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1); |
| 1898 | 5533 } |
|
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
|
5534 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
|
5535 } |
| 1898 | 5536 }else{ |
| 5537 /* 2px edge length (because we use same bS than the one for luma) */ | |
| 5538 for( d = 0; d < 2; d++ ){ | |
| 5539 const int p0 = pix[-1]; | |
| 5540 const int p1 = pix[-2]; | |
| 5541 const int q0 = pix[0]; | |
| 5542 const int q1 = pix[1]; | |
| 5543 | |
| 5544 if( ABS( p0 - q0 ) < alpha && | |
| 5545 ABS( p1 - p0 ) < beta && | |
| 5546 ABS( q1 - q0 ) < beta ) { | |
| 5547 | |
| 5548 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */ | |
| 5549 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ | |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
5550 //tprintf("filter_mb_edgecv i:%d d:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1); |
| 1898 | 5551 } |
| 5552 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
|
5553 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5554 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5555 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5556 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5557 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5558 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
|
5559 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
|
5560 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
|
5561 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
|
5562 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
|
5563 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
|
5564 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5565 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
|
5566 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
|
5567 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
|
5568 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
|
5569 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5570 |
| 1898 | 5571 if( bS[i] < 4 ) { |
| 5572 const int tc0 = tc0_table[index_a][bS[i] - 1]; | |
| 5573 /* 4px edge length */ | |
| 5574 for( d = 0; d < 4; d++ ) { | |
| 5575 const int p0 = pix[-1*pix_next]; | |
| 5576 const int p1 = pix[-2*pix_next]; | |
| 5577 const int p2 = pix[-3*pix_next]; | |
| 5578 const int q0 = pix[0]; | |
| 5579 const int q1 = pix[1*pix_next]; | |
| 5580 const int q2 = pix[2*pix_next]; | |
| 5581 | |
| 5582 if( ABS( p0 - q0 ) < alpha && | |
| 5583 ABS( p1 - p0 ) < beta && | |
| 5584 ABS( q1 - q0 ) < beta ) { | |
| 5585 | |
| 5586 int tc = tc0; | |
| 5587 int i_delta; | |
| 5588 | |
| 5589 if( ABS( p2 - p0 ) < beta ) { | |
| 5590 pix[-2*pix_next] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); | |
| 5591 tc++; | |
| 5592 } | |
| 5593 if( ABS( q2 - q0 ) < beta ) { | |
| 5594 pix[pix_next] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); | |
| 5595 tc++; | |
| 5596 } | |
| 5597 | |
| 5598 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
| 5599 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */ | |
| 5600 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
|
5601 } |
| 1898 | 5602 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
|
5603 } |
| 1898 | 5604 }else{ |
| 5605 /* 4px edge length */ | |
| 5606 for( d = 0; d < 4; d++ ) { | |
| 5607 const int p0 = pix[-1*pix_next]; | |
| 5608 const int p1 = pix[-2*pix_next]; | |
| 5609 const int p2 = pix[-3*pix_next]; | |
| 5610 const int q0 = pix[0]; | |
| 5611 const int q1 = pix[1*pix_next]; | |
| 5612 const int q2 = pix[2*pix_next]; | |
| 5613 | |
| 5614 if( ABS( p0 - q0 ) < alpha && | |
| 5615 ABS( p1 - p0 ) < beta && | |
| 5616 ABS( q1 - q0 ) < beta ) { | |
| 5617 | |
| 5618 const int p3 = pix[-4*pix_next]; | |
| 5619 const int q3 = pix[ 3*pix_next]; | |
| 5620 | |
| 5621 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
| 5622 if( ABS( p2 - p0 ) < beta) { | |
| 5623 /* p0', p1', p2' */ | |
| 5624 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
| 5625 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
| 5626 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
| 5627 } else { | |
| 5628 /* p0' */ | |
| 5629 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 5630 } | |
| 5631 if( ABS( q2 - q0 ) < beta) { | |
| 5632 /* q0', q1', q2' */ | |
| 5633 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
| 5634 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
| 5635 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
| 5636 } else { | |
| 5637 /* q0' */ | |
| 5638 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 5639 } | |
| 5640 }else{ | |
| 5641 /* p0', q0' */ | |
| 5642 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 5643 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 5644 } | |
|
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
|
5645 } |
| 1898 | 5646 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
|
5647 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5648 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5649 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5650 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5651 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5652 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
|
5653 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
|
5654 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
|
5655 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
|
5656 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
|
5657 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
|
5658 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5659 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
|
5660 { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5661 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
|
5662 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
|
5663 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
|
5664 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5665 |
| 1898 | 5666 if( bS[i] < 4 ) { |
| 5667 int tc = tc0_table[index_a][bS[i] - 1] + 1; | |
| 5668 /* 2px edge length (see deblocking_filter_edgecv) */ | |
| 5669 for( d = 0; d < 2; d++ ) { | |
| 5670 const int p0 = pix[-1*pix_next]; | |
| 5671 const int p1 = pix[-2*pix_next]; | |
| 5672 const int q0 = pix[0]; | |
| 5673 const int q1 = pix[1*pix_next]; | |
| 5674 | |
| 5675 if( ABS( p0 - q0 ) < alpha && | |
| 5676 ABS( p1 - p0 ) < beta && | |
| 5677 ABS( q1 - q0 ) < beta ) { | |
| 5678 | |
| 5679 int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); | |
| 5680 | |
| 5681 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */ | |
| 5682 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ | |
| 5683 } | |
|
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
|
5684 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
|
5685 } |
| 1898 | 5686 }else{ |
| 5687 /* 2px edge length (see deblocking_filter_edgecv) */ | |
| 5688 for( d = 0; d < 2; d++ ) { | |
| 5689 const int p0 = pix[-1*pix_next]; | |
| 5690 const int p1 = pix[-2*pix_next]; | |
| 5691 const int q0 = pix[0]; | |
| 5692 const int q1 = pix[1*pix_next]; | |
| 5693 | |
| 5694 if( ABS( p0 - q0 ) < alpha && | |
| 5695 ABS( p1 - p0 ) < beta && | |
| 5696 ABS( q1 - q0 ) < beta ) { | |
| 5697 | |
| 5698 pix[-pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */ | |
| 5699 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ | |
| 5700 } | |
| 5701 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
|
5702 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5703 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5704 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5705 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5706 |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5707 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
|
5708 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
|
5709 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
|
5710 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
|
5711 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
|
5712 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5713 /* 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
|
5714 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
|
5715 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
|
5716 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5717 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
|
5718 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
|
5719 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5720 /* 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
|
5721 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
|
5722 { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5723 int edge; |
| 2454 | 5724 const int mbm_xy = dir == 0 ? mb_xy -1 : mb_xy - s->mb_stride; |
| 5725 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0; | |
| 5726 | |
| 5727 if (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_table[mb_xy]) | |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5728 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
|
5729 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5730 /* 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
|
5731 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
|
5732 /* mbn_xy: neighbour macroblock (how that works for field ?) */ |
| 2454 | 5733 int mbn_xy = edge > 0 ? mb_xy : mbm_xy; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5734 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
|
5735 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
|
5736 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5737 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
|
5738 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
|
5739 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
|
5740 } 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
|
5741 int i; |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5742 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
|
5743 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
|
5744 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
|
5745 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
|
5746 int bn_idx= b_idx - (dir ? 8:1); |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5747 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5748 if( h->non_zero_count_cache[b_idx] != 0 || |
| 2449 | 5749 h->non_zero_count_cache[bn_idx] != 0 ) { |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5750 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
|
5751 } |
| 2523 | 5752 else |
| 5753 { | |
| 5754 /* FIXME: A given frame may occupy more than one position in | |
| 5755 * the reference list. So we should compare the frame numbers, | |
| 5756 * not the indices in the ref list. */ | |
| 5757 int l; | |
| 5758 bS[i] = 0; | |
| 5759 for( l = 0; l < 1 + (h->slice_type == B_TYPE); l++ ) { | |
| 5760 if( h->ref_cache[l][b_idx] != h->ref_cache[l][bn_idx] || | |
| 5761 ABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || | |
| 5762 ABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= 4 ) { | |
| 5763 bS[i] = 1; | |
| 5764 break; | |
| 5765 } | |
| 5766 } | |
|
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
|
5767 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5768 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5769 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5770 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
|
5771 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
|
5772 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5773 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5774 /* Filter edge */ |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5775 // Do not use s->qscale as luma quantiser because it has not the same |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5776 // value in IPCM macroblocks. |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5777 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1; |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
5778 //tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d, QPc:%d, QPcn:%d\n", mb_x, mb_y, dir, edge, qp, h->chroma_qp, s->current_picture.qscale_table[mbn_xy]); |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5779 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
|
5780 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp ); |
| 1898 | 5781 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
|
5782 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
|
5783 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
|
5784 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
|
5785 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
|
5786 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5787 } 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
|
5788 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp ); |
| 1898 | 5789 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
|
5790 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
|
5791 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
|
5792 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
|
5793 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
|
5794 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5795 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5796 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5797 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5798 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
5799 |
| 1168 | 5800 static int decode_slice(H264Context *h){ |
| 5801 MpegEncContext * const s = &h->s; | |
| 5802 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; | |
| 5803 | |
| 5804 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
|
5805 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5806 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
|
5807 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
|
5808 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5809 /* realign */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5810 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
|
5811 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5812 /* 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
|
5813 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
|
5814 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
|
5815 s->gb.buffer + get_bits_count(&s->gb)/8, |
| 2116 | 5816 ( 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
|
5817 /* 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
|
5818 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
|
5819 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
|
5820 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
|
5821 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
|
5822 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5823 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
|
5824 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5825 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
|
5826 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
|
5827 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5828 h->cabac_state[i] = 2 * ( pre - 64 ) + 1; |
| 1168 | 5829 } |
| 5830 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5831 for(;;){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5832 int ret = decode_mb_cabac(h); |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5833 int eos; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5834 |
| 2163 | 5835 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
|
5836 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5837 /* 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
|
5838 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
|
5839 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
|
5840 |
| 2163 | 5841 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
|
5842 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5843 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
|
5844 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
|
5845 } |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5846 eos = get_cabac_terminate( &h->cabac ); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5847 |
| 2116 | 5848 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
|
5849 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
|
5850 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
|
5851 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
|
5852 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5853 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5854 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
|
5855 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
|
5856 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
| 2392 | 5857 ++s->mb_y; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5858 if(h->sps.mb_aff && s->picture_structure==PICT_FRAME ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5859 ++s->mb_y; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5860 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5861 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5862 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5863 if( eos || s->mb_y >= s->mb_height ) { |
| 2392 | 5864 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
|
5865 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
|
5866 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
|
5867 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5868 #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
|
5869 /* 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
|
5870 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
|
5871 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
|
5872 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
|
5873 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5874 #endif |
| 1168 | 5875 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5876 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5877 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5878 for(;;){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5879 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
|
5880 |
| 2163 | 5881 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
|
5882 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5883 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
|
5884 s->mb_y++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5885 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
|
5886 |
| 2163 | 5887 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
|
5888 s->mb_y--; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5889 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5890 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5891 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
|
5892 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
|
5893 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
|
5894 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5895 return -1; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5896 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5897 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5898 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
|
5899 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
|
5900 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5901 ++s->mb_y; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5902 if(h->sps.mb_aff && s->picture_structure==PICT_FRAME ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5903 ++s->mb_y; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5904 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
5905 if(s->mb_y >= s->mb_height){ |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5906 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
|
5907 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5908 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
|
5909 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
|
5910 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5911 return 0; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5912 }else{ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5913 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
|
5914 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5915 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
|
5916 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5917 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5918 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5919 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5920 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){ |
| 2392 | 5921 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
|
5922 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){ |
| 1168 | 5923 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); |
| 5924 | |
| 5925 return 0; | |
| 5926 }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
|
5927 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 | 5928 |
| 5929 return -1; | |
| 5930 } | |
| 5931 } | |
| 5932 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5933 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5934 |
| 1168 | 5935 #if 0 |
| 5936 for(;s->mb_y < s->mb_height; s->mb_y++){ | |
| 5937 for(;s->mb_x < s->mb_width; s->mb_x++){ | |
| 5938 int ret= decode_mb(h); | |
| 5939 | |
| 5940 hl_decode_mb(h); | |
| 5941 | |
| 5942 if(ret<0){ | |
| 5943 fprintf(stderr, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); | |
| 5944 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); | |
| 5945 | |
| 5946 return -1; | |
| 5947 } | |
| 5948 | |
| 5949 if(++s->mb_x >= s->mb_width){ | |
| 5950 s->mb_x=0; | |
| 5951 if(++s->mb_y >= s->mb_height){ | |
| 5952 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
| 5953 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); | |
| 5954 | |
| 5955 return 0; | |
| 5956 }else{ | |
| 5957 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); | |
| 5958 | |
| 5959 return -1; | |
| 5960 } | |
| 5961 } | |
| 5962 } | |
| 5963 | |
| 5964 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){ | |
| 5965 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
| 5966 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); | |
| 5967 | |
| 5968 return 0; | |
| 5969 }else{ | |
| 5970 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); | |
| 5971 | |
| 5972 return -1; | |
| 5973 } | |
| 5974 } | |
| 5975 } | |
| 5976 s->mb_x=0; | |
| 5977 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
| 5978 } | |
| 5979 #endif | |
| 5980 return -1; //not reached | |
| 5981 } | |
| 5982 | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5983 static inline void decode_hrd_parameters(H264Context *h, SPS *sps){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5984 MpegEncContext * const s = &h->s; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5985 int cpb_count, i; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5986 cpb_count = get_ue_golomb(&s->gb) + 1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5987 get_bits(&s->gb, 4); /* bit_rate_scale */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5988 get_bits(&s->gb, 4); /* cpb_size_scale */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5989 for(i=0; i<cpb_count; i++){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5990 get_ue_golomb(&s->gb); /* bit_rate_value_minus1 */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5991 get_ue_golomb(&s->gb); /* cpb_size_value_minus1 */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5992 get_bits1(&s->gb); /* cbr_flag */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5993 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5994 get_bits(&s->gb, 5); /* initial_cpb_removal_delay_length_minus1 */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5995 get_bits(&s->gb, 5); /* cpb_removal_delay_length_minus1 */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5996 get_bits(&s->gb, 5); /* dpb_output_delay_length_minus1 */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5997 get_bits(&s->gb, 5); /* time_offset_length */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5998 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
5999 |
| 1168 | 6000 static inline int decode_vui_parameters(H264Context *h, SPS *sps){ |
| 6001 MpegEncContext * const s = &h->s; | |
| 6002 int aspect_ratio_info_present_flag, aspect_ratio_idc; | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6003 int nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag; |
| 1168 | 6004 |
| 6005 aspect_ratio_info_present_flag= get_bits1(&s->gb); | |
| 6006 | |
| 6007 if( aspect_ratio_info_present_flag ) { | |
| 6008 aspect_ratio_idc= get_bits(&s->gb, 8); | |
| 6009 if( aspect_ratio_idc == EXTENDED_SAR ) { | |
| 1548 | 6010 sps->sar.num= get_bits(&s->gb, 16); |
| 6011 sps->sar.den= get_bits(&s->gb, 16); | |
| 1168 | 6012 }else if(aspect_ratio_idc < 16){ |
| 1548 | 6013 sps->sar= pixel_aspect[aspect_ratio_idc]; |
| 1168 | 6014 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
6015 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n"); |
| 1168 | 6016 return -1; |
| 6017 } | |
| 6018 }else{ | |
| 1548 | 6019 sps->sar.num= |
| 6020 sps->sar.den= 0; | |
| 1168 | 6021 } |
| 6022 // 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
|
6023 |
|
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
|
6024 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
|
6025 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
|
6026 } |
|
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
|
6027 |
|
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
|
6028 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
|
6029 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
|
6030 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
|
6031 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
|
6032 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
|
6033 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
|
6034 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
|
6035 } |
|
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
|
6036 } |
|
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
|
6037 |
|
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
|
6038 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
|
6039 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
|
6040 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
|
6041 } |
|
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
|
6042 |
|
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
|
6043 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
|
6044 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
|
6045 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
|
6046 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
|
6047 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
|
6048 } |
|
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
|
6049 |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6050 nal_hrd_parameters_present_flag = get_bits1(&s->gb); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6051 if(nal_hrd_parameters_present_flag) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6052 decode_hrd_parameters(h, sps); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6053 vcl_hrd_parameters_present_flag = get_bits1(&s->gb); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6054 if(vcl_hrd_parameters_present_flag) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6055 decode_hrd_parameters(h, sps); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6056 if(nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6057 get_bits1(&s->gb); /* low_delay_hrd_flag */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6058 get_bits1(&s->gb); /* pic_struct_present_flag */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6059 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6060 sps->bitstream_restriction_flag = get_bits1(&s->gb); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6061 if(sps->bitstream_restriction_flag){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6062 get_bits1(&s->gb); /* motion_vectors_over_pic_boundaries_flag */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6063 get_ue_golomb(&s->gb); /* max_bytes_per_pic_denom */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6064 get_ue_golomb(&s->gb); /* max_bits_per_mb_denom */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6065 get_ue_golomb(&s->gb); /* log2_max_mv_length_horizontal */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6066 get_ue_golomb(&s->gb); /* log2_max_mv_length_vertical */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6067 sps->num_reorder_frames = get_ue_golomb(&s->gb); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6068 get_ue_golomb(&s->gb); /* max_dec_frame_buffering */ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6069 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6070 |
| 1168 | 6071 return 0; |
| 6072 } | |
| 6073 | |
| 6074 static inline int decode_seq_parameter_set(H264Context *h){ | |
| 6075 MpegEncContext * const s = &h->s; | |
| 1371 | 6076 int profile_idc, level_idc; |
| 1168 | 6077 int sps_id, i; |
| 6078 SPS *sps; | |
| 6079 | |
| 6080 profile_idc= get_bits(&s->gb, 8); | |
| 1371 | 6081 get_bits1(&s->gb); //constraint_set0_flag |
| 6082 get_bits1(&s->gb); //constraint_set1_flag | |
| 6083 get_bits1(&s->gb); //constraint_set2_flag | |
| 2312 | 6084 get_bits1(&s->gb); //constraint_set3_flag |
| 6085 get_bits(&s->gb, 4); // reserved | |
| 1168 | 6086 level_idc= get_bits(&s->gb, 8); |
| 6087 sps_id= get_ue_golomb(&s->gb); | |
| 6088 | |
| 6089 sps= &h->sps_buffer[ sps_id ]; | |
| 6090 sps->profile_idc= profile_idc; | |
| 6091 sps->level_idc= level_idc; | |
| 2312 | 6092 |
| 1168 | 6093 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4; |
| 6094 sps->poc_type= get_ue_golomb(&s->gb); | |
| 6095 | |
| 6096 if(sps->poc_type == 0){ //FIXME #define | |
| 6097 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4; | |
| 6098 } else if(sps->poc_type == 1){//FIXME #define | |
| 6099 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb); | |
| 6100 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb); | |
| 6101 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb); | |
| 6102 sps->poc_cycle_length= get_ue_golomb(&s->gb); | |
| 6103 | |
| 6104 for(i=0; i<sps->poc_cycle_length; i++) | |
| 6105 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb); | |
| 6106 } | |
| 6107 if(sps->poc_type > 2){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
6108 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type); |
| 1168 | 6109 return -1; |
| 6110 } | |
| 6111 | |
| 6112 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
|
6113 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
|
6114 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
|
6115 } |
| 1371 | 6116 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb); |
| 1168 | 6117 sps->mb_width= get_ue_golomb(&s->gb) + 1; |
| 6118 sps->mb_height= get_ue_golomb(&s->gb) + 1; | |
| 2422 | 6119 if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 || |
| 6120 avcodec_check_dimensions(NULL, 16*sps->mb_width, 16*sps->mb_height)) | |
| 6121 return -1; | |
| 6122 | |
| 1168 | 6123 sps->frame_mbs_only_flag= get_bits1(&s->gb); |
| 6124 if(!sps->frame_mbs_only_flag) | |
| 6125 sps->mb_aff= get_bits1(&s->gb); | |
| 6126 else | |
| 6127 sps->mb_aff= 0; | |
| 6128 | |
| 6129 sps->direct_8x8_inference_flag= get_bits1(&s->gb); | |
| 6130 | |
| 1371 | 6131 sps->crop= get_bits1(&s->gb); |
| 6132 if(sps->crop){ | |
| 6133 sps->crop_left = get_ue_golomb(&s->gb); | |
| 6134 sps->crop_right = get_ue_golomb(&s->gb); | |
| 6135 sps->crop_top = get_ue_golomb(&s->gb); | |
| 6136 sps->crop_bottom= get_ue_golomb(&s->gb); | |
| 6137 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
|
6138 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completly supported, this could look slightly wrong ...\n"); |
| 1371 | 6139 } |
| 6140 }else{ | |
| 6141 sps->crop_left = | |
| 6142 sps->crop_right = | |
| 6143 sps->crop_top = | |
| 6144 sps->crop_bottom= 0; | |
| 6145 } | |
| 6146 | |
| 1168 | 6147 sps->vui_parameters_present_flag= get_bits1(&s->gb); |
| 6148 if( sps->vui_parameters_present_flag ) | |
| 6149 decode_vui_parameters(h, sps); | |
| 6150 | |
| 6151 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
|
6152 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 | 6153 sps_id, sps->profile_idc, sps->level_idc, |
| 6154 sps->poc_type, | |
| 6155 sps->ref_frame_count, | |
| 6156 sps->mb_width, sps->mb_height, | |
| 6157 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"), | |
| 6158 sps->direct_8x8_inference_flag ? "8B8" : "", | |
| 1371 | 6159 sps->crop_left, sps->crop_right, |
| 6160 sps->crop_top, sps->crop_bottom, | |
| 1168 | 6161 sps->vui_parameters_present_flag ? "VUI" : "" |
| 6162 ); | |
| 6163 } | |
| 6164 return 0; | |
| 6165 } | |
| 6166 | |
| 6167 static inline int decode_picture_parameter_set(H264Context *h){ | |
| 6168 MpegEncContext * const s = &h->s; | |
| 6169 int pps_id= get_ue_golomb(&s->gb); | |
| 6170 PPS *pps= &h->pps_buffer[pps_id]; | |
| 6171 | |
| 6172 pps->sps_id= get_ue_golomb(&s->gb); | |
| 6173 pps->cabac= get_bits1(&s->gb); | |
| 6174 pps->pic_order_present= get_bits1(&s->gb); | |
| 6175 pps->slice_group_count= get_ue_golomb(&s->gb) + 1; | |
| 6176 if(pps->slice_group_count > 1 ){ | |
| 6177 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
|
6178 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n"); |
| 1168 | 6179 switch(pps->mb_slice_group_map_type){ |
| 6180 case 0: | |
| 6181 #if 0 | |
| 6182 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | | | |
| 6183 | run_length[ i ] |1 |ue(v) | | |
| 6184 #endif | |
| 6185 break; | |
| 6186 case 2: | |
| 6187 #if 0 | |
| 6188 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | | | |
| 6189 |{ | | | | |
| 6190 | top_left_mb[ i ] |1 |ue(v) | | |
| 6191 | bottom_right_mb[ i ] |1 |ue(v) | | |
| 6192 | } | | | | |
| 6193 #endif | |
| 6194 break; | |
| 6195 case 3: | |
| 6196 case 4: | |
| 6197 case 5: | |
| 6198 #if 0 | |
| 6199 | slice_group_change_direction_flag |1 |u(1) | | |
| 6200 | slice_group_change_rate_minus1 |1 |ue(v) | | |
| 6201 #endif | |
| 6202 break; | |
| 6203 case 6: | |
| 6204 #if 0 | |
| 6205 | slice_group_id_cnt_minus1 |1 |ue(v) | | |
| 6206 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | | | |
| 6207 |) | | | | |
| 6208 | slice_group_id[ i ] |1 |u(v) | | |
| 6209 #endif | |
| 1214 | 6210 break; |
| 1168 | 6211 } |
| 6212 } | |
| 6213 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
| 6214 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
| 6215 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
|
6216 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n"); |
| 1168 | 6217 return -1; |
| 6218 } | |
| 6219 | |
| 6220 pps->weighted_pred= get_bits1(&s->gb); | |
| 6221 pps->weighted_bipred_idc= get_bits(&s->gb, 2); | |
| 6222 pps->init_qp= get_se_golomb(&s->gb) + 26; | |
| 6223 pps->init_qs= get_se_golomb(&s->gb) + 26; | |
| 6224 pps->chroma_qp_index_offset= get_se_golomb(&s->gb); | |
| 6225 pps->deblocking_filter_parameters_present= get_bits1(&s->gb); | |
| 6226 pps->constrained_intra_pred= get_bits1(&s->gb); | |
| 6227 pps->redundant_pic_cnt_present = get_bits1(&s->gb); | |
| 6228 | |
| 6229 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
|
6230 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 | 6231 pps_id, pps->sps_id, |
| 6232 pps->cabac ? "CABAC" : "CAVLC", | |
| 6233 pps->slice_group_count, | |
| 6234 pps->ref_count[0], pps->ref_count[1], | |
| 6235 pps->weighted_pred ? "weighted" : "", | |
| 6236 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset, | |
| 6237 pps->deblocking_filter_parameters_present ? "LPAR" : "", | |
| 6238 pps->constrained_intra_pred ? "CONSTR" : "", | |
| 1371 | 6239 pps->redundant_pic_cnt_present ? "REDU" : "" |
| 1168 | 6240 ); |
| 6241 } | |
| 6242 | |
| 6243 return 0; | |
| 6244 } | |
| 6245 | |
| 6246 /** | |
| 6247 * finds the end of the current frame in the bitstream. | |
| 6248 * @return the position of the first byte of the next frame, or -1 | |
| 6249 */ | |
| 2392 | 6250 static int find_frame_end(H264Context *h, const uint8_t *buf, int buf_size){ |
| 1187 | 6251 int i; |
| 1168 | 6252 uint32_t state; |
| 2392 | 6253 ParseContext *pc = &(h->s.parse_context); |
| 1168 | 6254 //printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]); |
| 6255 // mb_addr= pc->mb_addr - 1; | |
| 6256 state= pc->state; | |
| 2392 | 6257 for(i=0; i<=buf_size; i++){ |
| 1168 | 6258 if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){ |
| 2392 | 6259 tprintf("find_frame_end new startcode = %08x, frame_start_found = %d, pos = %d\n", state, pc->frame_start_found, i); |
| 1168 | 6260 if(pc->frame_start_found){ |
| 2392 | 6261 // If there isn't one more byte in the buffer |
| 6262 // the test on first_mb_in_slice cannot be done yet | |
| 6263 // do it at next call. | |
| 6264 if (i >= buf_size) break; | |
| 6265 if (buf[i] & 0x80) { | |
| 6266 // first_mb_in_slice is 0, probably the first nal of a new | |
| 6267 // slice | |
| 6268 tprintf("find_frame_end frame_end_found, state = %08x, pos = %d\n", state, i); | |
| 6269 pc->state=-1; | |
| 6270 pc->frame_start_found= 0; | |
| 6271 return i-4; | |
| 6272 } | |
| 1168 | 6273 } |
| 2392 | 6274 pc->frame_start_found = 1; |
| 1168 | 6275 } |
| 2392 | 6276 if (i<buf_size) |
| 6277 state= (state<<8) | buf[i]; | |
| 1168 | 6278 } |
| 6279 | |
| 6280 pc->state= state; | |
| 1219 | 6281 return END_NOT_FOUND; |
| 1168 | 6282 } |
| 6283 | |
| 1988 | 6284 static int h264_parse(AVCodecParserContext *s, |
| 6285 AVCodecContext *avctx, | |
| 6286 uint8_t **poutbuf, int *poutbuf_size, | |
| 6287 const uint8_t *buf, int buf_size) | |
| 6288 { | |
| 2392 | 6289 H264Context *h = s->priv_data; |
| 6290 ParseContext *pc = &h->s.parse_context; | |
| 1988 | 6291 int next; |
| 6292 | |
| 2392 | 6293 next= find_frame_end(h, buf, buf_size); |
| 1988 | 6294 |
| 6295 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { | |
| 6296 *poutbuf = NULL; | |
| 6297 *poutbuf_size = 0; | |
| 6298 return buf_size; | |
| 6299 } | |
| 6300 | |
| 6301 *poutbuf = (uint8_t *)buf; | |
| 6302 *poutbuf_size = buf_size; | |
| 6303 return next; | |
| 6304 } | |
| 6305 | |
| 1168 | 6306 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ |
| 6307 MpegEncContext * const s = &h->s; | |
| 6308 AVCodecContext * const avctx= s->avctx; | |
| 6309 int buf_index=0; | |
| 1322 | 6310 #if 0 |
| 1168 | 6311 int i; |
| 6312 for(i=0; i<32; i++){ | |
| 6313 printf("%X ", buf[i]); | |
| 6314 } | |
| 6315 #endif | |
| 2392 | 6316 h->slice_num = 0; |
| 1168 | 6317 for(;;){ |
| 6318 int consumed; | |
| 6319 int dst_length; | |
| 6320 int bit_length; | |
| 6321 uint8_t *ptr; | |
| 2227 | 6322 int i, nalsize = 0; |
| 1168 | 6323 |
| 2227 | 6324 if(h->is_avc) { |
| 6325 if(buf_index >= buf_size) break; | |
| 6326 nalsize = 0; | |
| 6327 for(i = 0; i < h->nal_length_size; i++) | |
| 6328 nalsize = (nalsize << 8) | buf[buf_index++]; | |
| 6329 } else { | |
| 1168 | 6330 // start code prefix search |
| 6331 for(; buf_index + 3 < buf_size; buf_index++){ | |
| 6332 // this should allways succeed in the first iteration | |
| 6333 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | |
| 6334 break; | |
| 6335 } | |
| 6336 | |
| 6337 if(buf_index+3 >= buf_size) break; | |
| 6338 | |
| 6339 buf_index+=3; | |
| 2227 | 6340 } |
| 1168 | 6341 |
|
2401
46898a9fd6dc
Fix avc1 if there is nore than one nal per mov frame
rtognimp
parents:
2396
diff
changeset
|
6342 ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index); |
| 1168 | 6343 if(ptr[dst_length - 1] == 0) dst_length--; |
| 6344 bit_length= 8*dst_length - decode_rbsp_trailing(ptr + dst_length - 1); | |
| 6345 | |
| 6346 if(s->avctx->debug&FF_DEBUG_STARTCODE){ | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
6347 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 | 6348 } |
| 6349 | |
| 2227 | 6350 if (h->is_avc && (nalsize != consumed)) |
| 6351 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); | |
| 6352 | |
| 1168 | 6353 buf_index += consumed; |
| 6354 | |
|
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
|
6355 if( s->hurry_up == 1 && h->nal_ref_idc == 0 ) |
| 1168 | 6356 continue; |
| 6357 | |
| 6358 switch(h->nal_unit_type){ | |
| 6359 case NAL_IDR_SLICE: | |
| 6360 idr(h); //FIXME ensure we dont loose some frames if there is reordering | |
| 6361 case NAL_SLICE: | |
| 6362 init_get_bits(&s->gb, ptr, bit_length); | |
| 6363 h->intra_gb_ptr= | |
| 6364 h->inter_gb_ptr= &s->gb; | |
| 6365 s->data_partitioning = 0; | |
| 6366 | |
| 6367 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
|
6368 if(h->redundant_pic_count==0 && s->hurry_up < 5 ) |
| 1168 | 6369 decode_slice(h); |
| 6370 break; | |
| 6371 case NAL_DPA: | |
| 6372 init_get_bits(&s->gb, ptr, bit_length); | |
| 6373 h->intra_gb_ptr= | |
| 6374 h->inter_gb_ptr= NULL; | |
| 6375 s->data_partitioning = 1; | |
| 6376 | |
| 6377 if(decode_slice_header(h) < 0) return -1; | |
| 6378 break; | |
| 6379 case NAL_DPB: | |
| 6380 init_get_bits(&h->intra_gb, ptr, bit_length); | |
| 6381 h->intra_gb_ptr= &h->intra_gb; | |
| 6382 break; | |
| 6383 case NAL_DPC: | |
| 6384 init_get_bits(&h->inter_gb, ptr, bit_length); | |
| 6385 h->inter_gb_ptr= &h->inter_gb; | |
| 1174 | 6386 |
|
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
|
6387 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning && s->hurry_up < 5 ) |
| 1168 | 6388 decode_slice(h); |
| 6389 break; | |
| 6390 case NAL_SEI: | |
| 6391 break; | |
| 6392 case NAL_SPS: | |
| 6393 init_get_bits(&s->gb, ptr, bit_length); | |
| 6394 decode_seq_parameter_set(h); | |
| 6395 | |
| 6396 if(s->flags& CODEC_FLAG_LOW_DELAY) | |
| 6397 s->low_delay=1; | |
| 6398 | |
| 2538 | 6399 if(avctx->has_b_frames < 2) |
| 6400 avctx->has_b_frames= !s->low_delay; | |
| 1168 | 6401 break; |
| 6402 case NAL_PPS: | |
| 6403 init_get_bits(&s->gb, ptr, bit_length); | |
| 6404 | |
| 6405 decode_picture_parameter_set(h); | |
| 6406 | |
| 6407 break; | |
| 6408 case NAL_PICTURE_DELIMITER: | |
| 6409 break; | |
| 6410 case NAL_FILTER_DATA: | |
| 6411 break; | |
| 2099 | 6412 default: |
| 6413 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type); | |
| 1168 | 6414 } |
| 6415 } | |
| 6416 | |
| 1174 | 6417 if(!s->current_picture_ptr) return buf_index; //no frame |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6418 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6419 s->current_picture_ptr->pict_type= s->pict_type; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6420 s->current_picture_ptr->key_frame= s->pict_type == I_TYPE && h->nal_unit_type == NAL_IDR_SLICE; |
| 1174 | 6421 |
| 1168 | 6422 h->prev_frame_num_offset= h->frame_num_offset; |
| 6423 h->prev_frame_num= h->frame_num; | |
| 6424 if(s->current_picture_ptr->reference){ | |
| 6425 h->prev_poc_msb= h->poc_msb; | |
| 6426 h->prev_poc_lsb= h->poc_lsb; | |
| 6427 } | |
| 6428 if(s->current_picture_ptr->reference) | |
| 6429 execute_ref_pic_marking(h, h->mmco, h->mmco_index); | |
| 6430 | |
| 6431 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
|
6432 |
| 1168 | 6433 MPV_frame_end(s); |
| 6434 | |
| 6435 return buf_index; | |
| 6436 } | |
| 6437 | |
| 6438 /** | |
| 6439 * retunrs the number of bytes consumed for building the current frame | |
| 6440 */ | |
| 6441 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){ | |
| 6442 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
| 6443 pos -= s->parse_context.last_index; | |
| 6444 if(pos<0) pos=0; // FIXME remove (uneeded?) | |
| 6445 | |
| 6446 return pos; | |
| 6447 }else{ | |
| 6448 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...) | |
| 6449 if(pos+10>buf_size) pos=buf_size; // oops ;) | |
| 6450 | |
| 6451 return pos; | |
| 6452 } | |
| 6453 } | |
| 6454 | |
| 6455 static int decode_frame(AVCodecContext *avctx, | |
| 6456 void *data, int *data_size, | |
| 6457 uint8_t *buf, int buf_size) | |
| 6458 { | |
| 6459 H264Context *h = avctx->priv_data; | |
| 6460 MpegEncContext *s = &h->s; | |
| 6461 AVFrame *pict = data; | |
| 6462 int buf_index; | |
| 6463 | |
| 6464 s->flags= avctx->flags; | |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1706
diff
changeset
|
6465 s->flags2= avctx->flags2; |
| 1168 | 6466 |
| 6467 /* no supplementary picture */ | |
| 6468 if (buf_size == 0) { | |
| 6469 return 0; | |
| 6470 } | |
| 6471 | |
| 6472 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
| 2392 | 6473 int next= find_frame_end(h, buf, buf_size); |
| 1168 | 6474 |
| 1988 | 6475 if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 ) |
| 1168 | 6476 return buf_size; |
| 6477 //printf("next:%d buf_size:%d last_index:%d\n", next, buf_size, s->parse_context.last_index); | |
| 6478 } | |
| 6479 | |
| 2227 | 6480 if(h->is_avc && !h->got_avcC) { |
| 6481 int i, cnt, nalsize; | |
| 6482 unsigned char *p = avctx->extradata; | |
| 6483 if(avctx->extradata_size < 7) { | |
| 6484 av_log(avctx, AV_LOG_ERROR, "avcC too short\n"); | |
| 6485 return -1; | |
| 6486 } | |
| 6487 if(*p != 1) { | |
| 6488 av_log(avctx, AV_LOG_ERROR, "Unknown avcC version %d\n", *p); | |
| 6489 return -1; | |
| 6490 } | |
| 6491 /* sps and pps in the avcC always have length coded with 2 bytes, | |
| 6492 so put a fake nal_length_size = 2 while parsing them */ | |
| 6493 h->nal_length_size = 2; | |
| 6494 // Decode sps from avcC | |
| 6495 cnt = *(p+5) & 0x1f; // Number of sps | |
| 6496 p += 6; | |
| 6497 for (i = 0; i < cnt; i++) { | |
| 6498 nalsize = BE_16(p) + 2; | |
| 6499 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
| 6500 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); | |
| 6501 return -1; | |
| 6502 } | |
| 6503 p += nalsize; | |
| 6504 } | |
| 6505 // Decode pps from avcC | |
| 6506 cnt = *(p++); // Number of pps | |
| 6507 for (i = 0; i < cnt; i++) { | |
| 6508 nalsize = BE_16(p) + 2; | |
| 6509 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
| 6510 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); | |
| 6511 return -1; | |
| 6512 } | |
| 6513 p += nalsize; | |
| 6514 } | |
| 6515 // Now store right nal length size, that will be use to parse all other nals | |
| 6516 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1; | |
| 6517 // Do not reparse avcC | |
| 6518 h->got_avcC = 1; | |
| 6519 } | |
| 6520 | |
| 6521 if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){ | |
| 1168 | 6522 if(0 < decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) ) |
| 6523 return -1; | |
| 6524 } | |
| 6525 | |
| 6526 buf_index=decode_nal_units(h, buf, buf_size); | |
| 6527 if(buf_index < 0) | |
| 6528 return -1; | |
| 6529 | |
| 6530 //FIXME do something with unavailable reference frames | |
| 6531 | |
| 6532 // if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_index, buf_size); | |
| 1174 | 6533 if(!s->current_picture_ptr){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
6534 av_log(h->s.avctx, AV_LOG_DEBUG, "error, NO frame\n"); |
| 1174 | 6535 return -1; |
| 6536 } | |
| 6537 | |
| 2409 | 6538 { |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
6539 Picture *out = s->current_picture_ptr; |
| 2561 | 6540 #if 0 //decode order |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6541 *data_size = sizeof(AVFrame); |
| 2561 | 6542 #else |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6543 /* Sort B-frames into display order */ |
| 2409 | 6544 Picture *cur = s->current_picture_ptr; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6545 Picture *prev = h->delayed_output_pic; |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6546 int out_idx = 0; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6547 int pics = 0; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6548 int out_of_order; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6549 int cross_idr = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6550 int dropped_frame = 0; |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6551 int i; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6552 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6553 if(h->sps.bitstream_restriction_flag |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6554 && s->avctx->has_b_frames < h->sps.num_reorder_frames){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6555 s->avctx->has_b_frames = h->sps.num_reorder_frames; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6556 s->low_delay = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6557 } |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6558 |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6559 while(h->delayed_pic[pics]) pics++; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6560 h->delayed_pic[pics++] = cur; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6561 if(cur->reference == 0) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6562 cur->reference = 1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6563 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6564 for(i=0; h->delayed_pic[i]; i++) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6565 if(h->delayed_pic[i]->key_frame) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6566 cross_idr = 1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6567 |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6568 out = h->delayed_pic[0]; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6569 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6570 if(h->delayed_pic[i]->poc < out->poc){ |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6571 out = h->delayed_pic[i]; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6572 out_idx = i; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6573 } |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6574 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6575 out_of_order = !cross_idr && prev && out->poc < prev->poc; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6576 if(prev && pics <= s->avctx->has_b_frames) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6577 out = prev; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6578 else if((out_of_order && pics-1 == s->avctx->has_b_frames) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6579 || (s->low_delay && |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6580 ((!cross_idr && prev && out->poc > prev->poc + 2) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6581 || cur->pict_type == B_TYPE))) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6582 { |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6583 s->low_delay = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6584 s->avctx->has_b_frames++; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6585 out = prev; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6586 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6587 else if(out_of_order) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6588 out = prev; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6589 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6590 if(out_of_order || pics > s->avctx->has_b_frames){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6591 dropped_frame = (out != h->delayed_pic[out_idx]); |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6592 for(i=out_idx; h->delayed_pic[i]; i++) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6593 h->delayed_pic[i] = h->delayed_pic[i+1]; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6594 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
6595 |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6596 if(prev == out && !dropped_frame) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6597 *data_size = 0; |
| 2561 | 6598 else |
| 6599 *data_size = sizeof(AVFrame); | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6600 if(prev && prev != out && prev->reference == 1) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6601 prev->reference = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6602 h->delayed_output_pic = out; |
|
2441
358813ec4ca2
H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents:
2440
diff
changeset
|
6603 #endif |
| 2409 | 6604 |
| 6605 *pict= *(AVFrame*)out; | |
| 6606 } | |
| 6607 | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6608 assert(pict->data[0]); |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1698
diff
changeset
|
6609 ff_print_debug_info(s, pict); |
| 1168 | 6610 //printf("out %d\n", (int)pict->data[0]); |
| 6611 #if 0 //? | |
| 6612 | |
| 6613 /* Return the Picture timestamp as the frame number */ | |
| 6614 /* we substract 1 because it is added on utils.c */ | |
| 6615 avctx->frame_number = s->picture_number - 1; | |
| 6616 #endif | |
| 6617 return get_consumed_bytes(s, buf_index, buf_size); | |
| 6618 } | |
| 6619 #if 0 | |
| 6620 static inline void fill_mb_avail(H264Context *h){ | |
| 6621 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
|
6622 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 6623 |
| 6624 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
|
6625 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
|
6626 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
|
6627 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num; |
| 1168 | 6628 }else{ |
| 6629 h->mb_avail[0]= | |
| 6630 h->mb_avail[1]= | |
| 6631 h->mb_avail[2]= 0; | |
| 6632 } | |
| 6633 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num; | |
| 6634 h->mb_avail[4]= 1; //FIXME move out | |
| 6635 h->mb_avail[5]= 0; //FIXME move out | |
| 6636 } | |
| 6637 #endif | |
| 6638 | |
| 6639 #if 0 //selftest | |
| 6640 #define COUNT 8000 | |
| 6641 #define SIZE (COUNT*40) | |
| 6642 int main(){ | |
| 6643 int i; | |
| 6644 uint8_t temp[SIZE]; | |
| 6645 PutBitContext pb; | |
| 6646 GetBitContext gb; | |
| 6647 // int int_temp[10000]; | |
| 6648 DSPContext dsp; | |
| 6649 AVCodecContext avctx; | |
| 6650 | |
| 6651 dsputil_init(&dsp, &avctx); | |
| 6652 | |
|
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1453
diff
changeset
|
6653 init_put_bits(&pb, temp, SIZE); |
| 1168 | 6654 printf("testing unsigned exp golomb\n"); |
| 6655 for(i=0; i<COUNT; i++){ | |
| 6656 START_TIMER | |
| 6657 set_ue_golomb(&pb, i); | |
| 6658 STOP_TIMER("set_ue_golomb"); | |
| 6659 } | |
| 6660 flush_put_bits(&pb); | |
| 6661 | |
| 6662 init_get_bits(&gb, temp, 8*SIZE); | |
| 6663 for(i=0; i<COUNT; i++){ | |
| 6664 int j, s; | |
| 6665 | |
| 6666 s= show_bits(&gb, 24); | |
| 6667 | |
| 6668 START_TIMER | |
| 6669 j= get_ue_golomb(&gb); | |
| 6670 if(j != i){ | |
| 6671 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
| 6672 // return -1; | |
| 6673 } | |
| 6674 STOP_TIMER("get_ue_golomb"); | |
| 6675 } | |
| 6676 | |
| 6677 | |
| 1524 | 6678 init_put_bits(&pb, temp, SIZE); |
| 1168 | 6679 printf("testing signed exp golomb\n"); |
| 6680 for(i=0; i<COUNT; i++){ | |
| 6681 START_TIMER | |
| 6682 set_se_golomb(&pb, i - COUNT/2); | |
| 6683 STOP_TIMER("set_se_golomb"); | |
| 6684 } | |
| 6685 flush_put_bits(&pb); | |
| 6686 | |
| 6687 init_get_bits(&gb, temp, 8*SIZE); | |
| 6688 for(i=0; i<COUNT; i++){ | |
| 6689 int j, s; | |
| 6690 | |
| 6691 s= show_bits(&gb, 24); | |
| 6692 | |
| 6693 START_TIMER | |
| 6694 j= get_se_golomb(&gb); | |
| 6695 if(j != i - COUNT/2){ | |
| 6696 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
| 6697 // return -1; | |
| 6698 } | |
| 6699 STOP_TIMER("get_se_golomb"); | |
| 6700 } | |
| 6701 | |
| 6702 printf("testing 4x4 (I)DCT\n"); | |
| 6703 | |
| 6704 DCTELEM block[16]; | |
| 6705 uint8_t src[16], ref[16]; | |
| 6706 uint64_t error= 0, max_error=0; | |
| 6707 | |
| 6708 for(i=0; i<COUNT; i++){ | |
| 6709 int j; | |
| 6710 // printf("%d %d %d\n", r1, r2, (r2-r1)*16); | |
| 6711 for(j=0; j<16; j++){ | |
| 6712 ref[j]= random()%255; | |
| 6713 src[j]= random()%255; | |
| 6714 } | |
| 6715 | |
| 6716 h264_diff_dct_c(block, src, ref, 4); | |
| 6717 | |
| 6718 //normalize | |
| 6719 for(j=0; j<16; j++){ | |
| 6720 // printf("%d ", block[j]); | |
| 6721 block[j]= block[j]*4; | |
| 6722 if(j&1) block[j]= (block[j]*4 + 2)/5; | |
| 6723 if(j&4) block[j]= (block[j]*4 + 2)/5; | |
| 6724 } | |
| 6725 // printf("\n"); | |
| 6726 | |
|
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
6727 s->dsp.h264_idct_add(ref, block, 4); |
| 1168 | 6728 /* for(j=0; j<16; j++){ |
| 6729 printf("%d ", ref[j]); | |
| 6730 } | |
| 6731 printf("\n");*/ | |
| 6732 | |
| 6733 for(j=0; j<16; j++){ | |
| 6734 int diff= ABS(src[j] - ref[j]); | |
| 6735 | |
| 6736 error+= diff*diff; | |
| 6737 max_error= FFMAX(max_error, diff); | |
| 6738 } | |
| 6739 } | |
| 6740 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error ); | |
| 6741 #if 0 | |
| 6742 printf("testing quantizer\n"); | |
| 6743 for(qp=0; qp<52; qp++){ | |
| 6744 for(i=0; i<16; i++) | |
| 6745 src1_block[i]= src2_block[i]= random()%255; | |
| 6746 | |
| 6747 } | |
| 6748 #endif | |
| 6749 printf("Testing NAL layer\n"); | |
| 6750 | |
| 6751 uint8_t bitstream[COUNT]; | |
| 6752 uint8_t nal[COUNT*2]; | |
| 6753 H264Context h; | |
| 6754 memset(&h, 0, sizeof(H264Context)); | |
| 6755 | |
| 6756 for(i=0; i<COUNT; i++){ | |
| 6757 int zeros= i; | |
| 6758 int nal_length; | |
| 6759 int consumed; | |
| 6760 int out_length; | |
| 6761 uint8_t *out; | |
| 6762 int j; | |
| 6763 | |
| 6764 for(j=0; j<COUNT; j++){ | |
| 6765 bitstream[j]= (random() % 255) + 1; | |
| 6766 } | |
| 6767 | |
| 6768 for(j=0; j<zeros; j++){ | |
| 6769 int pos= random() % COUNT; | |
| 6770 while(bitstream[pos] == 0){ | |
| 6771 pos++; | |
| 6772 pos %= COUNT; | |
| 6773 } | |
| 6774 bitstream[pos]=0; | |
| 6775 } | |
| 6776 | |
| 6777 START_TIMER | |
| 6778 | |
| 6779 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2); | |
| 6780 if(nal_length<0){ | |
| 6781 printf("encoding failed\n"); | |
| 6782 return -1; | |
| 6783 } | |
| 6784 | |
| 6785 out= decode_nal(&h, nal, &out_length, &consumed, nal_length); | |
| 6786 | |
| 6787 STOP_TIMER("NAL") | |
| 6788 | |
| 6789 if(out_length != COUNT){ | |
| 6790 printf("incorrect length %d %d\n", out_length, COUNT); | |
| 6791 return -1; | |
| 6792 } | |
| 6793 | |
| 6794 if(consumed != nal_length){ | |
| 6795 printf("incorrect consumed length %d %d\n", nal_length, consumed); | |
| 6796 return -1; | |
| 6797 } | |
| 6798 | |
| 6799 if(memcmp(bitstream, out, COUNT)){ | |
| 6800 printf("missmatch\n"); | |
| 6801 return -1; | |
| 6802 } | |
| 6803 } | |
| 6804 | |
| 6805 printf("Testing RBSP\n"); | |
| 6806 | |
| 6807 | |
| 6808 return 0; | |
| 6809 } | |
| 6810 #endif | |
| 6811 | |
| 6812 | |
| 6813 static int decode_end(AVCodecContext *avctx) | |
| 6814 { | |
| 6815 H264Context *h = avctx->priv_data; | |
| 6816 MpegEncContext *s = &h->s; | |
| 6817 | |
| 6818 free_tables(h); //FIXME cleanup init stuff perhaps | |
| 6819 MPV_common_end(s); | |
| 6820 | |
| 6821 // memset(h, 0, sizeof(H264Context)); | |
| 6822 | |
| 6823 return 0; | |
| 6824 } | |
| 6825 | |
| 6826 | |
| 6827 AVCodec h264_decoder = { | |
| 6828 "h264", | |
| 6829 CODEC_TYPE_VIDEO, | |
| 6830 CODEC_ID_H264, | |
| 6831 sizeof(H264Context), | |
| 6832 decode_init, | |
| 6833 NULL, | |
| 6834 decode_end, | |
| 6835 decode_frame, | |
| 2453 | 6836 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
| 1168 | 6837 }; |
| 6838 | |
| 1988 | 6839 AVCodecParser h264_parser = { |
| 6840 { CODEC_ID_H264 }, | |
| 2392 | 6841 sizeof(H264Context), |
| 1988 | 6842 NULL, |
| 6843 h264_parse, | |
| 6844 ff_parse_close, | |
| 6845 }; | |
| 6846 | |
| 1234 | 6847 #include "svq3.c" |
