Mercurial > libavcodec.hg
annotate h264.c @ 2781:899a2ea0907c libavcodec
parenthesing to avoid compiler errors in the future - compared asm outputs, behaviour didnt changed
| author | alex |
|---|---|
| date | Sat, 02 Jul 2005 19:39:58 +0000 |
| parents | 3eddfe241bb9 |
| children | 0a8c847ad5e7 |
| 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; | |
| 2763 | 64 int transform_bypass; ///< qpprime_y_zero_transform_bypass_flag |
| 1168 | 65 int log2_max_frame_num; ///< log2_max_frame_num_minus4 + 4 |
| 66 int poc_type; ///< pic_order_cnt_type | |
| 67 int log2_max_poc_lsb; ///< log2_max_pic_order_cnt_lsb_minus4 | |
| 68 int delta_pic_order_always_zero_flag; | |
| 69 int offset_for_non_ref_pic; | |
| 70 int offset_for_top_to_bottom_field; | |
| 71 int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle | |
| 72 int ref_frame_count; ///< num_ref_frames | |
| 1371 | 73 int gaps_in_frame_num_allowed_flag; |
| 1168 | 74 int mb_width; ///< frame_width_in_mbs_minus1 + 1 |
| 75 int mb_height; ///< frame_height_in_mbs_minus1 + 1 | |
| 76 int frame_mbs_only_flag; | |
| 77 int mb_aff; ///<mb_adaptive_frame_field_flag | |
| 78 int direct_8x8_inference_flag; | |
| 1371 | 79 int crop; ///< frame_cropping_flag |
| 80 int crop_left; ///< frame_cropping_rect_left_offset | |
| 81 int crop_right; ///< frame_cropping_rect_right_offset | |
| 82 int crop_top; ///< frame_cropping_rect_top_offset | |
| 83 int crop_bottom; ///< frame_cropping_rect_bottom_offset | |
| 1168 | 84 int vui_parameters_present_flag; |
| 1548 | 85 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
|
86 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
|
87 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
|
88 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
|
89 int fixed_frame_rate_flag; |
| 1168 | 90 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
|
91 int bitstream_restriction_flag; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
92 int num_reorder_frames; |
| 1168 | 93 }SPS; |
| 94 | |
| 95 /** | |
| 96 * Picture parameter set | |
| 97 */ | |
| 98 typedef struct PPS{ | |
| 99 int sps_id; | |
| 100 int cabac; ///< entropy_coding_mode_flag | |
| 101 int pic_order_present; ///< pic_order_present_flag | |
| 102 int slice_group_count; ///< num_slice_groups_minus1 + 1 | |
| 103 int mb_slice_group_map_type; | |
| 104 int ref_count[2]; ///< num_ref_idx_l0/1_active_minus1 + 1 | |
| 105 int weighted_pred; ///< weighted_pred_flag | |
| 106 int weighted_bipred_idc; | |
| 107 int init_qp; ///< pic_init_qp_minus26 + 26 | |
| 108 int init_qs; ///< pic_init_qs_minus26 + 26 | |
| 109 int chroma_qp_index_offset; | |
| 110 int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag | |
| 111 int constrained_intra_pred; ///< constrained_intra_pred_flag | |
| 112 int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag | |
| 2755 | 113 int transform_8x8_mode; ///< transform_8x8_mode_flag |
| 1168 | 114 }PPS; |
| 115 | |
| 116 /** | |
| 117 * Memory management control operation opcode. | |
| 118 */ | |
| 119 typedef enum MMCOOpcode{ | |
| 120 MMCO_END=0, | |
| 121 MMCO_SHORT2UNUSED, | |
| 122 MMCO_LONG2UNUSED, | |
| 123 MMCO_SHORT2LONG, | |
| 124 MMCO_SET_MAX_LONG, | |
| 125 MMCO_RESET, | |
| 126 MMCO_LONG, | |
| 127 } MMCOOpcode; | |
| 128 | |
| 129 /** | |
| 130 * Memory management control operation. | |
| 131 */ | |
| 132 typedef struct MMCO{ | |
| 133 MMCOOpcode opcode; | |
| 134 int short_frame_num; | |
| 135 int long_index; | |
| 136 } MMCO; | |
| 137 | |
| 138 /** | |
| 139 * H264Context | |
| 140 */ | |
| 141 typedef struct H264Context{ | |
| 142 MpegEncContext s; | |
| 143 int nal_ref_idc; | |
| 144 int nal_unit_type; | |
| 145 #define NAL_SLICE 1 | |
| 146 #define NAL_DPA 2 | |
| 147 #define NAL_DPB 3 | |
| 148 #define NAL_DPC 4 | |
| 149 #define NAL_IDR_SLICE 5 | |
| 150 #define NAL_SEI 6 | |
| 151 #define NAL_SPS 7 | |
| 152 #define NAL_PPS 8 | |
| 153 #define NAL_PICTURE_DELIMITER 9 | |
| 154 #define NAL_FILTER_DATA 10 | |
| 155 uint8_t *rbsp_buffer; | |
| 156 int rbsp_buffer_size; | |
| 157 | |
| 2227 | 158 /** |
| 159 * Used to parse AVC variant of h264 | |
| 160 */ | |
| 161 int is_avc; ///< this flag is != 0 if codec is avc1 | |
| 162 int got_avcC; ///< flag used to parse avcC data only once | |
| 163 int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) | |
| 164 | |
| 1168 | 165 int chroma_qp; //QPc |
| 166 | |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
167 int prev_mb_skipped; //FIXME remove (IMHO not used) |
| 1168 | 168 |
| 169 //prediction stuff | |
| 170 int chroma_pred_mode; | |
| 171 int intra16x16_pred_mode; | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
172 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
173 int top_mb_xy; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
174 int left_mb_xy[2]; |
| 1168 | 175 |
| 176 int8_t intra4x4_pred_mode_cache[5*8]; | |
| 177 int8_t (*intra4x4_pred_mode)[8]; | |
| 178 void (*pred4x4 [9+3])(uint8_t *src, uint8_t *topright, int stride);//FIXME move to dsp? | |
| 2755 | 179 void (*pred8x8l [9+3])(uint8_t *src, int topleft, int topright, int stride); |
| 1168 | 180 void (*pred8x8 [4+3])(uint8_t *src, int stride); |
| 181 void (*pred16x16[4+3])(uint8_t *src, int stride); | |
| 182 unsigned int topleft_samples_available; | |
| 183 unsigned int top_samples_available; | |
| 184 unsigned int topright_samples_available; | |
| 185 unsigned int left_samples_available; | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
186 uint8_t (*top_borders[2])[16+2*8]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
187 uint8_t left_border[2*(17+2*9)]; |
| 1168 | 188 |
| 189 /** | |
| 190 * non zero coeff count cache. | |
| 191 * is 64 if not available. | |
| 192 */ | |
|
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
193 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
|
194 uint8_t (*non_zero_count)[16]; |
| 1168 | 195 |
| 196 /** | |
| 197 * Motion vector cache. | |
| 198 */ | |
|
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
199 int16_t mv_cache[2][5*8][2] __align8; |
|
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
200 int8_t ref_cache[2][5*8] __align8; |
| 1168 | 201 #define LIST_NOT_USED -1 //FIXME rename? |
| 202 #define PART_NOT_AVAILABLE -2 | |
| 203 | |
| 204 /** | |
| 205 * is 1 if the specific list MV&references are set to 0,0,-2. | |
| 206 */ | |
| 207 int mv_cache_clean[2]; | |
| 208 | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
209 /** |
| 2755 | 210 * number of neighbors (top and/or left) that used 8x8 dct |
| 211 */ | |
| 212 int neighbor_transform_size; | |
| 213 | |
| 214 /** | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
215 * 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
|
216 * 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
|
217 */ |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
218 int block_offset[2*(16+8)]; |
| 1168 | 219 |
|
2641
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
220 uint32_t *mb2b_xy; //FIXME are these 4 a good idea? |
|
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
221 uint32_t *mb2b8_xy; |
| 2395 | 222 int b_stride; //FIXME use s->b4_stride |
| 1168 | 223 int b8_stride; |
| 224 | |
| 1234 | 225 int halfpel_flag; |
| 226 int thirdpel_flag; | |
| 227 | |
| 1319 | 228 int unknown_svq3_flag; |
| 229 int next_slice_index; | |
| 230 | |
| 1168 | 231 SPS sps_buffer[MAX_SPS_COUNT]; |
| 232 SPS sps; ///< current sps | |
| 233 | |
| 234 PPS pps_buffer[MAX_PPS_COUNT]; | |
| 235 /** | |
| 236 * current pps | |
| 237 */ | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
238 PPS pps; //FIXME move to Picture perhaps? (->no) do we need that? |
| 1168 | 239 |
| 2763 | 240 uint16_t (*dequant4_coeff)[16]; // FIXME quant matrices should be per SPS or PPS |
| 2755 | 241 uint16_t (*dequant8_coeff)[64]; |
| 242 | |
| 1168 | 243 int slice_num; |
| 244 uint8_t *slice_table_base; | |
| 245 uint8_t *slice_table; ///< slice_table_base + mb_stride + 1 | |
| 246 int slice_type; | |
| 247 int slice_type_fixed; | |
| 248 | |
| 249 //interlacing specific flags | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
250 int mb_aff_frame; |
| 1168 | 251 int mb_field_decoding_flag; |
| 252 | |
| 253 int sub_mb_type[4]; | |
| 254 | |
| 255 //POC stuff | |
| 256 int poc_lsb; | |
| 257 int poc_msb; | |
| 258 int delta_poc_bottom; | |
| 259 int delta_poc[2]; | |
| 260 int frame_num; | |
| 261 int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0 | |
| 262 int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0 | |
| 263 int frame_num_offset; ///< for POC type 2 | |
| 264 int prev_frame_num_offset; ///< for POC type 2 | |
| 265 int prev_frame_num; ///< frame_num of the last pic for POC type 1/2 | |
| 266 | |
| 267 /** | |
| 268 * frame_num for frames or 2*frame_num for field pics. | |
| 269 */ | |
| 270 int curr_pic_num; | |
| 271 | |
| 272 /** | |
| 273 * max_frame_num or 2*max_frame_num for field pics. | |
| 274 */ | |
| 275 int max_pic_num; | |
| 276 | |
| 277 //Weighted pred stuff | |
| 2415 | 278 int use_weight; |
| 279 int use_weight_chroma; | |
| 1168 | 280 int luma_log2_weight_denom; |
| 281 int chroma_log2_weight_denom; | |
| 282 int luma_weight[2][16]; | |
| 283 int luma_offset[2][16]; | |
| 284 int chroma_weight[2][16][2]; | |
| 285 int chroma_offset[2][16][2]; | |
| 2415 | 286 int implicit_weight[16][16]; |
| 1168 | 287 |
| 288 //deblock | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
289 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
|
290 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
|
291 int slice_beta_offset; |
| 1168 | 292 |
| 293 int redundant_pic_count; | |
| 294 | |
| 295 int direct_spatial_mv_pred; | |
| 2396 | 296 int dist_scale_factor[16]; |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
297 int map_col_to_list0[2][16]; |
| 1168 | 298 |
| 299 /** | |
| 300 * num_ref_idx_l0/1_active_minus1 + 1 | |
| 301 */ | |
| 302 int ref_count[2];// FIXME split for AFF | |
| 2582 | 303 Picture *short_ref[32]; |
| 304 Picture *long_ref[32]; | |
| 1168 | 305 Picture default_ref_list[2][32]; |
| 306 Picture ref_list[2][32]; //FIXME size? | |
| 307 Picture field_ref_list[2][32]; //FIXME size? | |
| 2409 | 308 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
|
309 Picture *delayed_output_pic; |
| 1168 | 310 |
| 311 /** | |
| 312 * memory management control operations buffer. | |
| 313 */ | |
| 314 MMCO mmco[MAX_MMCO_COUNT]; | |
| 315 int mmco_index; | |
| 316 | |
| 317 int long_ref_count; ///< number of actual long term references | |
| 318 int short_ref_count; ///< number of actual short term references | |
| 319 | |
| 320 //data partitioning | |
| 321 GetBitContext intra_gb; | |
| 322 GetBitContext inter_gb; | |
| 323 GetBitContext *intra_gb_ptr; | |
| 324 GetBitContext *inter_gb_ptr; | |
| 325 | |
| 326 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
|
327 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
328 /** |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
329 * Cabac |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
330 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
331 CABACContext cabac; |
| 2755 | 332 uint8_t cabac_state[460]; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
333 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
|
334 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
335 /* 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
|
336 uint16_t *cbp_table; |
| 2314 | 337 int top_cbp; |
| 338 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
|
339 /* 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
|
340 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
|
341 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
|
342 int16_t (*mvd_table[2])[2]; |
|
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
343 int16_t mvd_cache[2][5*8][2] __align8; |
| 2396 | 344 uint8_t *direct_table; |
| 345 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
|
346 |
|
2748
135aa7d0bd17
avoid one transpose (730->680 dezicycles on duron)
michael
parents:
2717
diff
changeset
|
347 uint8_t zigzag_scan[16]; |
|
135aa7d0bd17
avoid one transpose (730->680 dezicycles on duron)
michael
parents:
2717
diff
changeset
|
348 uint8_t field_scan[16]; |
| 2763 | 349 const uint8_t *zigzag_scan_q0; |
| 350 const uint8_t *field_scan_q0; | |
| 1168 | 351 }H264Context; |
| 352 | |
| 353 static VLC coeff_token_vlc[4]; | |
| 354 static VLC chroma_dc_coeff_token_vlc; | |
| 355 | |
| 356 static VLC total_zeros_vlc[15]; | |
| 357 static VLC chroma_dc_total_zeros_vlc[3]; | |
| 358 | |
| 359 static VLC run_vlc[6]; | |
| 360 static VLC run7_vlc; | |
| 361 | |
| 1234 | 362 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); |
| 363 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc); | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
364 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize); |
| 1234 | 365 |
| 1269 | 366 static inline uint32_t pack16to32(int a, int b){ |
| 367 #ifdef WORDS_BIGENDIAN | |
| 368 return (b&0xFFFF) + (a<<16); | |
| 369 #else | |
| 370 return (a&0xFFFF) + (b<<16); | |
| 371 #endif | |
| 372 } | |
| 373 | |
| 1168 | 374 /** |
| 375 * fill a rectangle. | |
| 2392 | 376 * @param h height of the rectangle, should be a constant |
| 377 * @param w width of the rectangle, should be a constant | |
| 1168 | 378 * @param size the size of val (1 or 4), should be a constant |
| 379 */ | |
| 1187 | 380 static inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){ //FIXME ensure this IS inlined |
| 381 uint8_t *p= (uint8_t*)vp; | |
| 1168 | 382 assert(size==1 || size==4); |
| 383 | |
| 384 w *= size; | |
| 385 stride *= size; | |
| 386 | |
|
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
387 assert((((int)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0); |
| 2669 | 388 assert((stride&(w-1))==0); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
389 //FIXME check what gcc generates for 64 bit on x86 and possibly write a 32 bit ver of it |
| 1168 | 390 if(w==2 && h==2){ |
| 391 *(uint16_t*)(p + 0)= | |
| 392 *(uint16_t*)(p + stride)= size==4 ? val : val*0x0101; | |
| 393 }else if(w==2 && h==4){ | |
| 394 *(uint16_t*)(p + 0*stride)= | |
| 395 *(uint16_t*)(p + 1*stride)= | |
| 396 *(uint16_t*)(p + 2*stride)= | |
| 397 *(uint16_t*)(p + 3*stride)= size==4 ? val : val*0x0101; | |
| 1252 | 398 }else if(w==4 && h==1){ |
| 399 *(uint32_t*)(p + 0*stride)= size==4 ? val : val*0x01010101; | |
| 1168 | 400 }else if(w==4 && h==2){ |
| 401 *(uint32_t*)(p + 0*stride)= | |
| 402 *(uint32_t*)(p + 1*stride)= size==4 ? val : val*0x01010101; | |
| 403 }else if(w==4 && h==4){ | |
| 404 *(uint32_t*)(p + 0*stride)= | |
| 405 *(uint32_t*)(p + 1*stride)= | |
| 406 *(uint32_t*)(p + 2*stride)= | |
| 407 *(uint32_t*)(p + 3*stride)= size==4 ? val : val*0x01010101; | |
| 408 }else if(w==8 && h==1){ | |
| 409 *(uint32_t*)(p + 0)= | |
| 410 *(uint32_t*)(p + 4)= size==4 ? val : val*0x01010101; | |
| 411 }else if(w==8 && h==2){ | |
| 412 *(uint32_t*)(p + 0 + 0*stride)= | |
| 413 *(uint32_t*)(p + 4 + 0*stride)= | |
| 414 *(uint32_t*)(p + 0 + 1*stride)= | |
| 415 *(uint32_t*)(p + 4 + 1*stride)= size==4 ? val : val*0x01010101; | |
| 416 }else if(w==8 && h==4){ | |
| 417 *(uint64_t*)(p + 0*stride)= | |
| 418 *(uint64_t*)(p + 1*stride)= | |
| 419 *(uint64_t*)(p + 2*stride)= | |
| 420 *(uint64_t*)(p + 3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
| 421 }else if(w==16 && h==2){ | |
| 422 *(uint64_t*)(p + 0+0*stride)= | |
| 423 *(uint64_t*)(p + 8+0*stride)= | |
| 424 *(uint64_t*)(p + 0+1*stride)= | |
| 425 *(uint64_t*)(p + 8+1*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
| 426 }else if(w==16 && h==4){ | |
| 427 *(uint64_t*)(p + 0+0*stride)= | |
| 428 *(uint64_t*)(p + 8+0*stride)= | |
| 429 *(uint64_t*)(p + 0+1*stride)= | |
| 430 *(uint64_t*)(p + 8+1*stride)= | |
| 431 *(uint64_t*)(p + 0+2*stride)= | |
| 432 *(uint64_t*)(p + 8+2*stride)= | |
| 433 *(uint64_t*)(p + 0+3*stride)= | |
| 434 *(uint64_t*)(p + 8+3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
| 435 }else | |
| 436 assert(0); | |
| 437 } | |
| 438 | |
| 2449 | 439 static inline void fill_caches(H264Context *h, int mb_type, int for_deblock){ |
| 1168 | 440 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
|
441 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 442 int topleft_xy, top_xy, topright_xy, left_xy[2]; |
| 443 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
|
444 int left_block[8]; |
| 1168 | 445 int i; |
| 446 | |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
447 //FIXME deblocking can skip fill_caches much of the time with multiple slices too. |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
448 // the actual condition is whether we're on the edge of a slice, |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
449 // and even then the intra and nnz parts are unnecessary. |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
450 if(for_deblock && h->slice_num == 1) |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
451 return; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
452 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
453 //wow what a mess, why didn't they simplify the interlacing&intra stuff, i can't imagine that these complex rules are worth it |
| 1168 | 454 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
455 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
|
456 topleft_xy = top_xy - 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
457 topright_xy= top_xy + 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
458 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
|
459 left_block[0]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
460 left_block[1]= 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
461 left_block[2]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
462 left_block[3]= 3; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
463 left_block[4]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
464 left_block[5]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
465 left_block[6]= 8; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
466 left_block[7]= 11; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
467 if(h->mb_aff_frame){ |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
468 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
|
469 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
|
470 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
|
471 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
|
472 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
|
473 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
|
474 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
|
475 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
|
476 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
|
477 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
|
478 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
|
479 if (bottom |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
480 ? !curr_mb_frame_flag // bottom macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
481 : (!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
|
482 ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
483 top_xy -= s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
484 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
485 if (bottom |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
486 ? !curr_mb_frame_flag // bottom macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
487 : (!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
|
488 ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
489 topleft_xy -= s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
490 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
491 if (bottom |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
492 ? !curr_mb_frame_flag // bottom macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
493 : (!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
|
494 ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
495 topright_xy -= s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
496 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
497 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
|
498 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
|
499 if (curr_mb_frame_flag) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
500 if (bottom) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
501 left_block[0]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
502 left_block[1]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
503 left_block[2]= 3; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
504 left_block[3]= 3; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
505 left_block[4]= 8; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
506 left_block[5]= 11; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
507 left_block[6]= 8; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
508 left_block[7]= 11; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
509 } else { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
510 left_block[0]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
511 left_block[1]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
512 left_block[2]= 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
513 left_block[3]= 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
514 left_block[4]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
515 left_block[5]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
516 left_block[6]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
517 left_block[7]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
518 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
519 } else { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
520 left_xy[1] += s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
521 //left_block[0]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
522 left_block[1]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
523 left_block[2]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
524 left_block[3]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
525 //left_block[4]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
526 left_block[5]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
527 left_block[6]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
528 left_block[7]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
529 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
530 } |
| 1168 | 531 } |
| 532 | |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
533 h->top_mb_xy = top_xy; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
534 h->left_mb_xy[0] = left_xy[0]; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
535 h->left_mb_xy[1] = left_xy[1]; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
536 if(for_deblock){ |
| 2449 | 537 topleft_type = h->slice_table[topleft_xy ] < 255 ? s->current_picture.mb_type[topleft_xy] : 0; |
| 538 top_type = h->slice_table[top_xy ] < 255 ? s->current_picture.mb_type[top_xy] : 0; | |
| 539 topright_type= h->slice_table[topright_xy] < 255 ? s->current_picture.mb_type[topright_xy]: 0; | |
| 540 left_type[0] = h->slice_table[left_xy[0] ] < 255 ? s->current_picture.mb_type[left_xy[0]] : 0; | |
| 541 left_type[1] = h->slice_table[left_xy[1] ] < 255 ? s->current_picture.mb_type[left_xy[1]] : 0; | |
| 542 }else{ | |
| 543 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0; | |
| 544 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0; | |
| 545 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0; | |
| 546 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0; | |
| 547 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0; | |
| 548 } | |
| 1168 | 549 |
| 550 if(IS_INTRA(mb_type)){ | |
| 551 h->topleft_samples_available= | |
| 552 h->top_samples_available= | |
| 553 h->left_samples_available= 0xFFFF; | |
| 554 h->topright_samples_available= 0xEEEA; | |
| 555 | |
| 556 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){ | |
| 557 h->topleft_samples_available= 0xB3FF; | |
| 558 h->top_samples_available= 0x33FF; | |
| 559 h->topright_samples_available= 0x26EA; | |
| 560 } | |
| 561 for(i=0; i<2; i++){ | |
| 562 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){ | |
| 563 h->topleft_samples_available&= 0xDF5F; | |
| 564 h->left_samples_available&= 0x5F5F; | |
| 565 } | |
| 566 } | |
| 567 | |
| 568 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred)) | |
| 569 h->topleft_samples_available&= 0x7FFF; | |
| 570 | |
| 571 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred)) | |
| 572 h->topright_samples_available&= 0xFBFF; | |
| 573 | |
| 574 if(IS_INTRA4x4(mb_type)){ | |
| 575 if(IS_INTRA4x4(top_type)){ | |
| 576 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4]; | |
| 577 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5]; | |
| 578 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6]; | |
| 579 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3]; | |
| 580 }else{ | |
| 581 int pred; | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
582 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
|
583 pred= -1; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
584 else{ |
| 1168 | 585 pred= 2; |
| 586 } | |
| 587 h->intra4x4_pred_mode_cache[4+8*0]= | |
| 588 h->intra4x4_pred_mode_cache[5+8*0]= | |
| 589 h->intra4x4_pred_mode_cache[6+8*0]= | |
| 590 h->intra4x4_pred_mode_cache[7+8*0]= pred; | |
| 591 } | |
| 592 for(i=0; i<2; i++){ | |
| 593 if(IS_INTRA4x4(left_type[i])){ | |
| 594 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[0+2*i]]; | |
| 595 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[1+2*i]]; | |
| 596 }else{ | |
| 597 int pred; | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
598 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
|
599 pred= -1; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
600 else{ |
| 1168 | 601 pred= 2; |
| 602 } | |
| 603 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= | |
| 604 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred; | |
| 605 } | |
| 606 } | |
| 607 } | |
| 608 } | |
| 609 | |
| 610 | |
| 611 /* | |
| 612 0 . T T. T T T T | |
| 613 1 L . .L . . . . | |
| 614 2 L . .L . . . . | |
| 615 3 . T TL . . . . | |
| 616 4 L . .L . . . . | |
| 617 5 L . .. . . . . | |
| 618 */ | |
| 619 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec) | |
| 620 if(top_type){ | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
621 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
|
622 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
|
623 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
|
624 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3]; |
| 1168 | 625 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
626 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
|
627 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8]; |
| 1168 | 628 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
629 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
|
630 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11]; |
| 2314 | 631 |
| 1168 | 632 }else{ |
| 633 h->non_zero_count_cache[4+8*0]= | |
| 634 h->non_zero_count_cache[5+8*0]= | |
| 635 h->non_zero_count_cache[6+8*0]= | |
| 636 h->non_zero_count_cache[7+8*0]= | |
| 637 | |
| 638 h->non_zero_count_cache[1+8*0]= | |
| 639 h->non_zero_count_cache[2+8*0]= | |
| 640 | |
| 641 h->non_zero_count_cache[1+8*3]= | |
| 2314 | 642 h->non_zero_count_cache[2+8*3]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
| 643 | |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
644 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
645 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
646 for (i=0; i<2; i++) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
647 if(left_type[i]){ |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
648 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
|
649 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
|
650 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
|
651 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
|
652 }else{ |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
653 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
|
654 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
|
655 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
|
656 h->non_zero_count_cache[0+8*4 + 8*i]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
657 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
658 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
659 |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
660 if( h->pps.cabac ) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
661 // top_cbp |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
662 if(top_type) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
663 h->top_cbp = h->cbp_table[top_xy]; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
664 } else if(IS_INTRA(mb_type)) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
665 h->top_cbp = 0x1C0; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
666 } else { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
667 h->top_cbp = 0; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
668 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
669 // left_cbp |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
670 if (left_type[0]) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
671 h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
672 } else if(IS_INTRA(mb_type)) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
673 h->left_cbp = 0x1C0; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
674 } else { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
675 h->left_cbp = 0; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
676 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
677 if (left_type[0]) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
678 h->left_cbp |= ((h->cbp_table[left_xy[0]]>>((left_block[0]&(~1))+1))&0x1) << 1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
679 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
680 if (left_type[1]) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
681 h->left_cbp |= ((h->cbp_table[left_xy[1]]>>((left_block[2]&(~1))+1))&0x1) << 3; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
682 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
683 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
684 |
| 1168 | 685 #if 1 |
| 2396 | 686 //FIXME direct mb can skip much of this |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
687 if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){ |
| 1168 | 688 int list; |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
689 for(list=0; list<1+(h->slice_type==B_TYPE); list++){ |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
690 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !h->deblocking_filter){ |
| 1168 | 691 /*if(!h->mv_cache_clean[list]){ |
| 692 memset(h->mv_cache [list], 0, 8*5*2*sizeof(int16_t)); //FIXME clean only input? clean at all? | |
| 693 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t)); | |
| 694 h->mv_cache_clean[list]= 1; | |
| 695 }*/ | |
| 2396 | 696 continue; |
| 1168 | 697 } |
| 698 h->mv_cache_clean[list]= 0; | |
| 699 | |
| 700 if(IS_INTER(top_type)){ | |
| 701 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; | |
| 702 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride; | |
| 703 *(uint32_t*)h->mv_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 0]; | |
| 704 *(uint32_t*)h->mv_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 1]; | |
| 705 *(uint32_t*)h->mv_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 2]; | |
| 706 *(uint32_t*)h->mv_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 3]; | |
| 707 h->ref_cache[list][scan8[0] + 0 - 1*8]= | |
| 708 h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][b8_xy + 0]; | |
| 709 h->ref_cache[list][scan8[0] + 2 - 1*8]= | |
| 710 h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][b8_xy + 1]; | |
| 711 }else{ | |
| 712 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]= | |
| 713 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]= | |
| 714 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]= | |
| 715 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0; | |
| 716 *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101; | |
| 717 } | |
| 718 | |
| 719 //FIXME unify cleanup or sth | |
| 720 if(IS_INTER(left_type[0])){ | |
| 721 const int b_xy= h->mb2b_xy[left_xy[0]] + 3; | |
| 722 const int b8_xy= h->mb2b8_xy[left_xy[0]] + 1; | |
| 723 *(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]]; | |
| 724 *(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]]; | |
| 725 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
| 726 h->ref_cache[list][scan8[0] - 1 + 1*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0]>>1)]; | |
| 727 }else{ | |
| 728 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 0*8]= | |
| 729 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 1*8]= 0; | |
| 730 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
| 731 h->ref_cache[list][scan8[0] - 1 + 1*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
| 732 } | |
| 733 | |
| 734 if(IS_INTER(left_type[1])){ | |
| 735 const int b_xy= h->mb2b_xy[left_xy[1]] + 3; | |
| 736 const int b8_xy= h->mb2b8_xy[left_xy[1]] + 1; | |
| 737 *(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]]; | |
| 738 *(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]]; | |
| 739 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
| 740 h->ref_cache[list][scan8[0] - 1 + 3*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[2]>>1)]; | |
| 741 }else{ | |
| 742 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 2*8]= | |
| 743 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 3*8]= 0; | |
| 744 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
| 745 h->ref_cache[list][scan8[0] - 1 + 3*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
| 2669 | 746 assert((!left_type[0]) == (!left_type[1])); |
| 1168 | 747 } |
| 748 | |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
749 if(for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)) |
| 2449 | 750 continue; |
| 751 | |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
752 if(IS_INTER(topleft_type)){ |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
753 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
754 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
755 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
756 h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy]; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
757 }else{ |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
758 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= 0; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
759 h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
760 } |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
761 |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
762 if(IS_INTER(topright_type)){ |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
763 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
764 const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
765 *(uint32_t*)h->mv_cache[list][scan8[0] + 4 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy]; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
766 h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][b8_xy]; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
767 }else{ |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
768 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
769 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
770 } |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
771 |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
772 |
| 1168 | 773 h->ref_cache[list][scan8[5 ]+1] = |
| 774 h->ref_cache[list][scan8[7 ]+1] = | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
775 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewhere else) |
| 1168 | 776 h->ref_cache[list][scan8[4 ]] = |
| 777 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; | |
| 778 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]= | |
| 779 *(uint32_t*)h->mv_cache [list][scan8[7 ]+1]= | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
780 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else) |
| 1168 | 781 *(uint32_t*)h->mv_cache [list][scan8[4 ]]= |
| 782 *(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
|
783 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
784 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
|
785 /* 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
|
786 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
|
787 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
|
788 *(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
|
789 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
790 *(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
|
791 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
792 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
793 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
|
794 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
|
795 *(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
|
796 *(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
|
797 *(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
|
798 *(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
|
799 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
800 *(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
|
801 *(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
|
802 *(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
|
803 *(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
|
804 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
805 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
|
806 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
|
807 *(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
|
808 *(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
|
809 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
810 *(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
|
811 *(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
|
812 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
813 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
|
814 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
|
815 *(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
|
816 *(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
|
817 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
818 *(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
|
819 *(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
|
820 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
821 *(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
|
822 *(uint32_t*)h->mvd_cache [list][scan8[7 ]+1]= |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
823 *(uint32_t*)h->mvd_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else) |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
824 *(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
|
825 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0; |
| 2396 | 826 |
| 827 if(h->slice_type == B_TYPE){ | |
| 828 fill_rectangle(&h->direct_cache[scan8[0]], 4, 4, 8, 0, 1); | |
| 829 | |
| 830 if(IS_DIRECT(top_type)){ | |
| 831 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101; | |
| 832 }else if(IS_8X8(top_type)){ | |
| 833 int b8_xy = h->mb2b8_xy[top_xy] + h->b8_stride; | |
| 834 h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy]; | |
| 835 h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 1]; | |
| 836 }else{ | |
| 837 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0; | |
| 838 } | |
| 839 | |
| 840 //FIXME interlacing | |
| 841 if(IS_DIRECT(left_type[0])){ | |
| 842 h->direct_cache[scan8[0] - 1 + 0*8]= | |
| 843 h->direct_cache[scan8[0] - 1 + 2*8]= 1; | |
| 844 }else if(IS_8X8(left_type[0])){ | |
| 845 int b8_xy = h->mb2b8_xy[left_xy[0]] + 1; | |
| 846 h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[b8_xy]; | |
| 847 h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[b8_xy + h->b8_stride]; | |
| 848 }else{ | |
| 849 h->direct_cache[scan8[0] - 1 + 0*8]= | |
| 850 h->direct_cache[scan8[0] - 1 + 2*8]= 0; | |
| 851 } | |
| 852 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
853 } |
| 1168 | 854 } |
| 855 } | |
| 856 #endif | |
| 2755 | 857 |
| 858 h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]); | |
| 1168 | 859 } |
| 860 | |
| 861 static inline void write_back_intra_pred_mode(H264Context *h){ | |
| 862 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
|
863 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 864 |
| 865 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1]; | |
| 866 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2]; | |
| 867 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3]; | |
| 868 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4]; | |
| 869 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4]; | |
| 870 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4]; | |
| 871 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4]; | |
| 872 } | |
| 873 | |
| 874 /** | |
| 875 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
| 876 */ | |
| 877 static inline int check_intra4x4_pred_mode(H264Context *h){ | |
| 878 MpegEncContext * const s = &h->s; | |
| 879 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0}; | |
| 880 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED}; | |
| 881 int i; | |
| 882 | |
| 883 if(!(h->top_samples_available&0x8000)){ | |
| 884 for(i=0; i<4; i++){ | |
| 885 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ]; | |
| 886 if(status<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
887 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 | 888 return -1; |
| 889 } else if(status){ | |
| 890 h->intra4x4_pred_mode_cache[scan8[0] + i]= status; | |
| 891 } | |
| 892 } | |
| 893 } | |
| 894 | |
| 895 if(!(h->left_samples_available&0x8000)){ | |
| 896 for(i=0; i<4; i++){ | |
| 897 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ]; | |
| 898 if(status<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
899 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 | 900 return -1; |
| 901 } else if(status){ | |
| 902 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status; | |
| 903 } | |
| 904 } | |
| 905 } | |
| 906 | |
| 907 return 0; | |
| 908 } //FIXME cleanup like next | |
| 909 | |
| 910 /** | |
| 911 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
| 912 */ | |
| 913 static inline int check_intra_pred_mode(H264Context *h, int mode){ | |
| 914 MpegEncContext * const s = &h->s; | |
| 915 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1}; | |
| 916 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8}; | |
| 917 | |
| 2392 | 918 if(mode < 0 || mode > 6) { |
| 919 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 | 920 return -1; |
| 2392 | 921 } |
| 2163 | 922 |
| 1168 | 923 if(!(h->top_samples_available&0x8000)){ |
| 924 mode= top[ mode ]; | |
| 925 if(mode<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
926 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 | 927 return -1; |
| 928 } | |
| 929 } | |
| 930 | |
| 931 if(!(h->left_samples_available&0x8000)){ | |
| 932 mode= left[ mode ]; | |
| 933 if(mode<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
934 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 | 935 return -1; |
| 936 } | |
| 937 } | |
| 938 | |
| 939 return mode; | |
| 940 } | |
| 941 | |
| 942 /** | |
| 943 * gets the predicted intra4x4 prediction mode. | |
| 944 */ | |
| 945 static inline int pred_intra_mode(H264Context *h, int n){ | |
| 946 const int index8= scan8[n]; | |
| 947 const int left= h->intra4x4_pred_mode_cache[index8 - 1]; | |
| 948 const int top = h->intra4x4_pred_mode_cache[index8 - 8]; | |
| 949 const int min= FFMIN(left, top); | |
| 950 | |
| 1170 | 951 tprintf("mode:%d %d min:%d\n", left ,top, min); |
| 1168 | 952 |
| 953 if(min<0) return DC_PRED; | |
| 954 else return min; | |
| 955 } | |
| 956 | |
| 957 static inline void write_back_non_zero_count(H264Context *h){ | |
| 958 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
|
959 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
|
960 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
961 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
|
962 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
|
963 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
|
964 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
|
965 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
|
966 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
|
967 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
|
968 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
969 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
|
970 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
|
971 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
|
972 |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
973 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
|
974 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
|
975 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[2+8*4]; |
| 1168 | 976 } |
| 977 | |
| 978 /** | |
| 979 * gets the predicted number of non zero coefficients. | |
| 980 * @param n block index | |
| 981 */ | |
| 982 static inline int pred_non_zero_count(H264Context *h, int n){ | |
| 983 const int index8= scan8[n]; | |
| 984 const int left= h->non_zero_count_cache[index8 - 1]; | |
| 985 const int top = h->non_zero_count_cache[index8 - 8]; | |
| 986 int i= left + top; | |
| 987 | |
| 988 if(i<64) i= (i+1)>>1; | |
| 989 | |
| 1170 | 990 tprintf("pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31); |
| 1168 | 991 |
| 992 return i&31; | |
| 993 } | |
| 994 | |
| 1169 | 995 static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width){ |
| 996 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ]; | |
| 997 | |
| 998 if(topright_ref != PART_NOT_AVAILABLE){ | |
| 999 *C= h->mv_cache[list][ i - 8 + part_width ]; | |
| 1000 return topright_ref; | |
| 1001 }else{ | |
| 1170 | 1002 tprintf("topright MV not available\n"); |
| 1003 | |
| 1169 | 1004 *C= h->mv_cache[list][ i - 8 - 1 ]; |
| 1005 return h->ref_cache[list][ i - 8 - 1 ]; | |
| 1006 } | |
| 1007 } | |
| 1008 | |
| 1168 | 1009 /** |
| 1010 * gets the predicted MV. | |
| 1011 * @param n the block index | |
| 1012 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4) | |
| 1013 * @param mx the x component of the predicted motion vector | |
| 1014 * @param my the y component of the predicted motion vector | |
| 1015 */ | |
| 1016 static inline void pred_motion(H264Context * const h, int n, int part_width, int list, int ref, int * const mx, int * const my){ | |
| 1017 const int index8= scan8[n]; | |
| 1018 const int top_ref= h->ref_cache[list][ index8 - 8 ]; | |
| 1019 const int left_ref= h->ref_cache[list][ index8 - 1 ]; | |
| 1020 const int16_t * const A= h->mv_cache[list][ index8 - 1 ]; | |
| 1021 const int16_t * const B= h->mv_cache[list][ index8 - 8 ]; | |
| 1169 | 1022 const int16_t * C; |
| 1023 int diagonal_ref, match_count; | |
| 1024 | |
| 1168 | 1025 assert(part_width==1 || part_width==2 || part_width==4); |
| 1169 | 1026 |
| 1168 | 1027 /* mv_cache |
| 1028 B . . A T T T T | |
| 1029 U . . L . . , . | |
| 1030 U . . L . . . . | |
| 1031 U . . L . . , . | |
| 1032 . . . L . . . . | |
| 1033 */ | |
| 1169 | 1034 |
| 1035 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width); | |
| 1036 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
|
1037 tprintf("pred_motion match_count=%d\n", match_count); |
| 1169 | 1038 if(match_count > 1){ //most common |
| 1039 *mx= mid_pred(A[0], B[0], C[0]); | |
| 1040 *my= mid_pred(A[1], B[1], C[1]); | |
| 1041 }else if(match_count==1){ | |
| 1042 if(left_ref==ref){ | |
| 1043 *mx= A[0]; | |
| 1044 *my= A[1]; | |
| 1045 }else if(top_ref==ref){ | |
| 1046 *mx= B[0]; | |
| 1047 *my= B[1]; | |
| 1048 }else{ | |
| 1049 *mx= C[0]; | |
| 1050 *my= C[1]; | |
| 1051 } | |
| 1052 }else{ | |
| 1053 if(top_ref == PART_NOT_AVAILABLE && diagonal_ref == PART_NOT_AVAILABLE && left_ref != PART_NOT_AVAILABLE){ | |
| 1054 *mx= A[0]; | |
| 1055 *my= A[1]; | |
| 1168 | 1056 }else{ |
| 1057 *mx= mid_pred(A[0], B[0], C[0]); | |
| 1058 *my= mid_pred(A[1], B[1], C[1]); | |
| 1059 } | |
| 1169 | 1060 } |
| 1168 | 1061 |
| 1187 | 1062 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 | 1063 } |
| 1064 | |
| 1065 /** | |
| 1066 * gets the directionally predicted 16x8 MV. | |
| 1067 * @param n the block index | |
| 1068 * @param mx the x component of the predicted motion vector | |
| 1069 * @param my the y component of the predicted motion vector | |
| 1070 */ | |
| 1071 static inline void pred_16x8_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
| 1072 if(n==0){ | |
| 1073 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ]; | |
| 1074 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ]; | |
| 1075 | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1076 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 | 1077 |
| 1078 if(top_ref == ref){ | |
| 1079 *mx= B[0]; | |
| 1080 *my= B[1]; | |
| 1081 return; | |
| 1082 } | |
| 1083 }else{ | |
| 1084 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ]; | |
| 1085 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ]; | |
| 1086 | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1087 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 | 1088 |
| 1089 if(left_ref == ref){ | |
| 1090 *mx= A[0]; | |
| 1091 *my= A[1]; | |
| 1092 return; | |
| 1093 } | |
| 1094 } | |
| 1095 | |
| 1096 //RARE | |
| 1097 pred_motion(h, n, 4, list, ref, mx, my); | |
| 1098 } | |
| 1099 | |
| 1100 /** | |
| 1101 * gets the directionally predicted 8x16 MV. | |
| 1102 * @param n the block index | |
| 1103 * @param mx the x component of the predicted motion vector | |
| 1104 * @param my the y component of the predicted motion vector | |
| 1105 */ | |
| 1106 static inline void pred_8x16_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
| 1107 if(n==0){ | |
| 1108 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ]; | |
| 1109 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ]; | |
| 1110 | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1111 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 | 1112 |
| 1113 if(left_ref == ref){ | |
| 1114 *mx= A[0]; | |
| 1115 *my= A[1]; | |
| 1116 return; | |
| 1117 } | |
| 1118 }else{ | |
| 1169 | 1119 const int16_t * C; |
| 1120 int diagonal_ref; | |
| 1121 | |
| 1122 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2); | |
| 1168 | 1123 |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1124 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 | 1125 |
| 1169 | 1126 if(diagonal_ref == ref){ |
| 1168 | 1127 *mx= C[0]; |
| 1128 *my= C[1]; | |
| 1129 return; | |
| 1130 } | |
| 1131 } | |
| 1132 | |
| 1133 //RARE | |
| 1134 pred_motion(h, n, 2, list, ref, mx, my); | |
| 1135 } | |
| 1136 | |
| 1137 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){ | |
| 1138 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ]; | |
| 1139 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ]; | |
| 1140 | |
| 2392 | 1141 tprintf("pred_pskip: (%d) (%d) at %2d %2d\n", top_ref, left_ref, h->s.mb_x, h->s.mb_y); |
| 1168 | 1142 |
| 1143 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE | |
| 1144 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0) | |
| 1145 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){ | |
| 1146 | |
| 1147 *mx = *my = 0; | |
| 1148 return; | |
| 1149 } | |
| 1150 | |
| 1151 pred_motion(h, 0, 4, 0, 0, mx, my); | |
| 1152 | |
| 1153 return; | |
| 1154 } | |
| 1155 | |
| 2396 | 1156 static inline void direct_dist_scale_factor(H264Context * const h){ |
| 1157 const int poc = h->s.current_picture_ptr->poc; | |
| 1158 const int poc1 = h->ref_list[1][0].poc; | |
| 1159 int i; | |
| 1160 for(i=0; i<h->ref_count[0]; i++){ | |
| 1161 int poc0 = h->ref_list[0][i].poc; | |
| 1162 int td = clip(poc1 - poc0, -128, 127); | |
| 1163 if(td == 0 /* FIXME || pic0 is a long-term ref */){ | |
| 1164 h->dist_scale_factor[i] = 256; | |
| 1165 }else{ | |
| 1166 int tb = clip(poc - poc0, -128, 127); | |
| 1167 int tx = (16384 + (ABS(td) >> 1)) / td; | |
| 1168 h->dist_scale_factor[i] = clip((tb*tx + 32) >> 6, -1024, 1023); | |
| 1169 } | |
| 1170 } | |
| 1171 } | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1172 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
|
1173 MpegEncContext * const s = &h->s; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1174 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
|
1175 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
|
1176 int list, i, j; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1177 if(cur->pict_type == I_TYPE) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1178 cur->ref_count[0] = 0; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1179 if(cur->pict_type != B_TYPE) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1180 cur->ref_count[1] = 0; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1181 for(list=0; list<2; list++){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1182 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
|
1183 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
|
1184 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
|
1185 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1186 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
|
1187 return; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1188 for(list=0; list<2; list++){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1189 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
|
1190 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
|
1191 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
|
1192 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
|
1193 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
|
1194 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
|
1195 break; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1196 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1197 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1198 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1199 } |
| 2396 | 1200 |
| 1201 static inline void pred_direct_motion(H264Context * const h, int *mb_type){ | |
| 1202 MpegEncContext * const s = &h->s; | |
| 1203 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; | |
| 1204 const int b8_xy = 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
| 1205 const int b4_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
| 1206 const int mb_type_col = h->ref_list[1][0].mb_type[mb_xy]; | |
| 1207 const int16_t (*l1mv0)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[0][b4_xy]; | |
| 1208 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
|
1209 const int8_t *l1ref1 = &h->ref_list[1][0].ref_index[1][b8_xy]; |
| 2396 | 1210 const int is_b8x8 = IS_8X8(*mb_type); |
| 1211 int sub_mb_type; | |
| 1212 int i8, i4; | |
| 1213 | |
| 1214 if(IS_8X8(mb_type_col) && !h->sps.direct_8x8_inference_flag){ | |
| 1215 /* FIXME save sub mb types from previous frames (or derive from MVs) | |
| 1216 * so we know exactly what block size to use */ | |
| 1217 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */ | |
| 2536 | 1218 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
| 2396 | 1219 }else if(!is_b8x8 && (IS_16X16(mb_type_col) || IS_INTRA(mb_type_col))){ |
| 1220 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ | |
| 1221 *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */ | |
| 1222 }else{ | |
| 1223 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ | |
| 2536 | 1224 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
| 2396 | 1225 } |
| 1226 if(!is_b8x8) | |
| 1227 *mb_type |= MB_TYPE_DIRECT2; | |
| 1228 | |
|
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
|
1229 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
|
1230 |
| 2396 | 1231 if(h->direct_spatial_mv_pred){ |
| 1232 int ref[2]; | |
| 1233 int mv[2][2]; | |
| 1234 int list; | |
| 1235 | |
| 1236 /* ref = min(neighbors) */ | |
| 1237 for(list=0; list<2; list++){ | |
| 1238 int refa = h->ref_cache[list][scan8[0] - 1]; | |
| 1239 int refb = h->ref_cache[list][scan8[0] - 8]; | |
| 1240 int refc = h->ref_cache[list][scan8[0] - 8 + 4]; | |
| 1241 if(refc == -2) | |
| 1242 refc = h->ref_cache[list][scan8[0] - 8 - 1]; | |
| 1243 ref[list] = refa; | |
| 1244 if(ref[list] < 0 || (refb < ref[list] && refb >= 0)) | |
| 1245 ref[list] = refb; | |
| 1246 if(ref[list] < 0 || (refc < ref[list] && refc >= 0)) | |
| 1247 ref[list] = refc; | |
| 1248 if(ref[list] < 0) | |
| 1249 ref[list] = -1; | |
| 1250 } | |
| 1251 | |
| 1252 if(ref[0] < 0 && ref[1] < 0){ | |
| 1253 ref[0] = ref[1] = 0; | |
| 1254 mv[0][0] = mv[0][1] = | |
| 1255 mv[1][0] = mv[1][1] = 0; | |
| 1256 }else{ | |
| 1257 for(list=0; list<2; list++){ | |
| 1258 if(ref[list] >= 0) | |
| 1259 pred_motion(h, 0, 4, list, ref[list], &mv[list][0], &mv[list][1]); | |
| 1260 else | |
| 1261 mv[list][0] = mv[list][1] = 0; | |
| 1262 } | |
| 1263 } | |
| 1264 | |
| 1265 if(ref[1] < 0){ | |
| 1266 *mb_type &= ~MB_TYPE_P0L1; | |
| 1267 sub_mb_type &= ~MB_TYPE_P0L1; | |
| 1268 }else if(ref[0] < 0){ | |
| 1269 *mb_type &= ~MB_TYPE_P0L0; | |
| 1270 sub_mb_type &= ~MB_TYPE_P0L0; | |
| 1271 } | |
| 1272 | |
| 1273 if(IS_16X16(*mb_type)){ | |
| 1274 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref[0], 1); | |
| 1275 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, ref[1], 1); | |
| 1276 if(!IS_INTRA(mb_type_col) && l1ref0[0] == 0 && | |
| 1277 ABS(l1mv0[0][0]) <= 1 && ABS(l1mv0[0][1]) <= 1){ | |
| 1278 if(ref[0] > 0) | |
| 1279 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
| 1280 else | |
| 1281 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 1282 if(ref[1] > 0) | |
| 1283 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
| 1284 else | |
| 1285 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 1286 }else{ | |
| 1287 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
| 1288 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
| 1289 } | |
| 1290 }else{ | |
| 1291 for(i8=0; i8<4; i8++){ | |
| 1292 const int x8 = i8&1; | |
| 1293 const int y8 = i8>>1; | |
| 1294 | |
| 1295 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
| 1296 continue; | |
| 1297 h->sub_mb_type[i8] = sub_mb_type; | |
| 1298 | |
| 1299 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
| 1300 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
| 1301 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref[0], 1); | |
| 1302 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, ref[1], 1); | |
| 1303 | |
| 1304 /* col_zero_flag */ | |
| 1305 if(!IS_INTRA(mb_type_col) && l1ref0[x8 + y8*h->b8_stride] == 0){ | |
| 1306 for(i4=0; i4<4; i4++){ | |
| 1307 const int16_t *mv_col = l1mv0[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; | |
| 1308 if(ABS(mv_col[0]) <= 1 && ABS(mv_col[1]) <= 1){ | |
| 1309 if(ref[0] == 0) | |
| 1310 *(uint32_t*)h->mv_cache[0][scan8[i8*4+i4]] = 0; | |
| 1311 if(ref[1] == 0) | |
| 1312 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = 0; | |
| 1313 } | |
| 1314 } | |
| 1315 } | |
| 1316 } | |
| 1317 } | |
| 1318 }else{ /* direct temporal mv pred */ | |
| 1319 if(IS_16X16(*mb_type)){ | |
| 1320 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, 0, 1); | |
| 1321 if(IS_INTRA(mb_type_col)){ | |
| 1322 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
| 1323 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 1324 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 1325 }else{ | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1326 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
|
1327 : h->map_col_to_list0[1][l1ref1[0]]; |
| 2396 | 1328 const int dist_scale_factor = h->dist_scale_factor[ref0]; |
| 1329 const int16_t *mv_col = l1mv0[0]; | |
| 1330 int mv_l0[2]; | |
| 1331 mv_l0[0] = (dist_scale_factor * mv_col[0] + 128) >> 8; | |
| 1332 mv_l0[1] = (dist_scale_factor * mv_col[1] + 128) >> 8; | |
| 1333 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref0, 1); | |
| 1334 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv_l0[0],mv_l0[1]), 4); | |
| 1335 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); | |
| 1336 } | |
| 1337 }else{ | |
| 1338 for(i8=0; i8<4; i8++){ | |
| 1339 const int x8 = i8&1; | |
| 1340 const int y8 = i8>>1; | |
| 1341 int ref0, dist_scale_factor; | |
| 1342 | |
| 1343 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
| 1344 continue; | |
| 1345 h->sub_mb_type[i8] = sub_mb_type; | |
| 1346 if(IS_INTRA(mb_type_col)){ | |
| 1347 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1); | |
| 1348 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); | |
| 1349 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
| 1350 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
| 1351 continue; | |
| 1352 } | |
| 1353 | |
| 1354 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
|
1355 if(ref0 >= 0) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1356 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
|
1357 else |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1358 ref0 = h->map_col_to_list0[1][l1ref1[x8 + y8*h->b8_stride]]; |
| 2396 | 1359 dist_scale_factor = h->dist_scale_factor[ref0]; |
| 1360 | |
| 1361 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1); | |
| 1362 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); | |
| 1363 for(i4=0; i4<4; i4++){ | |
| 1364 const int16_t *mv_col = l1mv0[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; | |
| 1365 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]]; | |
| 1366 mv_l0[0] = (dist_scale_factor * mv_col[0] + 128) >> 8; | |
| 1367 mv_l0[1] = (dist_scale_factor * mv_col[1] + 128) >> 8; | |
| 1368 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = | |
| 1369 pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]); | |
| 1370 } | |
| 1371 } | |
| 1372 } | |
| 1373 } | |
| 1374 } | |
| 1375 | |
| 1168 | 1376 static inline void write_back_motion(H264Context *h, int mb_type){ |
| 1377 MpegEncContext * const s = &h->s; | |
| 1378 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
| 1379 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
| 1380 int list; | |
| 1381 | |
| 1382 for(list=0; list<2; list++){ | |
| 1383 int y; | |
| 2535 | 1384 if(!USES_LIST(mb_type, list)){ |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
1385 if(1){ //FIXME skip or never read if mb_type doesn't use it |
| 1168 | 1386 for(y=0; y<4; y++){ |
| 1387 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]= | |
| 1388 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= 0; | |
| 1389 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1390 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
|
1391 /* FIXME needed ? */ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1392 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
|
1393 *(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
|
1394 *(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
|
1395 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1396 } |
| 1168 | 1397 for(y=0; y<2; y++){ |
|
2675
c6aa5585954f
alignment fix by (G?bor Kov?cs >picard demoscene hu)
michael
parents:
2674
diff
changeset
|
1398 s->current_picture.ref_index[list][b8_xy + 0 + y*h->b8_stride]= |
|
c6aa5585954f
alignment fix by (G?bor Kov?cs >picard demoscene hu)
michael
parents:
2674
diff
changeset
|
1399 s->current_picture.ref_index[list][b8_xy + 1 + y*h->b8_stride]= LIST_NOT_USED; |
| 1168 | 1400 } |
| 1401 } | |
| 2396 | 1402 continue; |
| 1168 | 1403 } |
| 1404 | |
| 1405 for(y=0; y<4; y++){ | |
| 1406 *(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]; | |
| 1407 *(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]; | |
| 1408 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1409 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
|
1410 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
|
1411 *(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
|
1412 *(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
|
1413 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1414 } |
| 1168 | 1415 for(y=0; y<2; y++){ |
| 1416 s->current_picture.ref_index[list][b8_xy + 0 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+0 + 16*y]; | |
| 1417 s->current_picture.ref_index[list][b8_xy + 1 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+2 + 16*y]; | |
| 1418 } | |
| 1419 } | |
| 2396 | 1420 |
| 1421 if(h->slice_type == B_TYPE && h->pps.cabac){ | |
| 1422 if(IS_8X8(mb_type)){ | |
| 1423 h->direct_table[b8_xy+1+0*h->b8_stride] = IS_DIRECT(h->sub_mb_type[1]) ? 1 : 0; | |
| 1424 h->direct_table[b8_xy+0+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[2]) ? 1 : 0; | |
| 1425 h->direct_table[b8_xy+1+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[3]) ? 1 : 0; | |
| 1426 } | |
| 1427 } | |
| 1168 | 1428 } |
| 1429 | |
| 1430 /** | |
| 1431 * Decodes a network abstraction layer unit. | |
| 1432 * @param consumed is the number of bytes used as input | |
| 1433 * @param length is the length of the array | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
1434 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing? |
| 1168 | 1435 * @returns decoded bytes, might be src+1 if no escapes |
| 1436 */ | |
| 1437 static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *consumed, int length){ | |
| 1438 int i, si, di; | |
| 1439 uint8_t *dst; | |
| 1440 | |
| 1441 // src[0]&0x80; //forbidden bit | |
| 1442 h->nal_ref_idc= src[0]>>5; | |
| 1443 h->nal_unit_type= src[0]&0x1F; | |
| 1444 | |
| 1445 src++; length--; | |
| 1446 #if 0 | |
| 1447 for(i=0; i<length; i++) | |
| 1448 printf("%2X ", src[i]); | |
| 1449 #endif | |
| 1450 for(i=0; i+1<length; i+=2){ | |
| 1451 if(src[i]) continue; | |
| 1452 if(i>0 && src[i-1]==0) i--; | |
| 1453 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
| 1454 if(src[i+2]!=3){ | |
| 1455 /* startcode, so we must be past the end */ | |
| 1456 length=i; | |
| 1457 } | |
| 1458 break; | |
| 1459 } | |
| 1460 } | |
| 1461 | |
| 1462 if(i>=length-1){ //no escaped 0 | |
| 1463 *dst_length= length; | |
| 1464 *consumed= length+1; //+1 for the header | |
| 1465 return src; | |
| 1466 } | |
| 1467 | |
| 1468 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length); | |
| 1469 dst= h->rbsp_buffer; | |
| 1470 | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
1471 //printf("decoding esc\n"); |
| 1168 | 1472 si=di=0; |
| 1473 while(si<length){ | |
| 1474 //remove escapes (very rare 1:2^22) | |
| 1475 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
| 1476 if(src[si+2]==3){ //escape | |
| 1477 dst[di++]= 0; | |
| 1478 dst[di++]= 0; | |
| 1479 si+=3; | |
|
1957
54411768fa38
h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1956
diff
changeset
|
1480 continue; |
| 1168 | 1481 }else //next start code |
| 1482 break; | |
| 1483 } | |
| 1484 | |
| 1485 dst[di++]= src[si++]; | |
| 1486 } | |
| 1487 | |
| 1488 *dst_length= di; | |
| 1489 *consumed= si + 1;//+1 for the header | |
| 1490 //FIXME store exact number of bits in the getbitcontext (its needed for decoding) | |
| 1491 return dst; | |
| 1492 } | |
| 1493 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1494 #if 0 |
| 1168 | 1495 /** |
| 1496 * @param src the data which should be escaped | |
| 1497 * @param dst the target buffer, dst+1 == src is allowed as a special case | |
| 1498 * @param length the length of the src data | |
| 1499 * @param dst_length the length of the dst array | |
| 1500 * @returns length of escaped data in bytes or -1 if an error occured | |
| 1501 */ | |
| 1502 static int encode_nal(H264Context *h, uint8_t *dst, uint8_t *src, int length, int dst_length){ | |
| 1503 int i, escape_count, si, di; | |
| 1504 uint8_t *temp; | |
| 1505 | |
| 1506 assert(length>=0); | |
| 1507 assert(dst_length>0); | |
| 1508 | |
| 1509 dst[0]= (h->nal_ref_idc<<5) + h->nal_unit_type; | |
| 1510 | |
| 1511 if(length==0) return 1; | |
| 1512 | |
| 1513 escape_count= 0; | |
| 1514 for(i=0; i<length; i+=2){ | |
| 1515 if(src[i]) continue; | |
| 1516 if(i>0 && src[i-1]==0) | |
| 1517 i--; | |
| 1518 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
| 1519 escape_count++; | |
| 1520 i+=2; | |
| 1521 } | |
| 1522 } | |
| 1523 | |
| 1524 if(escape_count==0){ | |
| 1525 if(dst+1 != src) | |
| 1526 memcpy(dst+1, src, length); | |
| 1527 return length + 1; | |
| 1528 } | |
| 1529 | |
| 1530 if(length + escape_count + 1> dst_length) | |
| 1531 return -1; | |
| 1532 | |
| 1533 //this should be damn rare (hopefully) | |
| 1534 | |
| 1535 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length + escape_count); | |
| 1536 temp= h->rbsp_buffer; | |
| 1537 //printf("encoding esc\n"); | |
| 1538 | |
| 1539 si= 0; | |
| 1540 di= 0; | |
| 1541 while(si < length){ | |
| 1542 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
| 1543 temp[di++]= 0; si++; | |
| 1544 temp[di++]= 0; si++; | |
| 1545 temp[di++]= 3; | |
| 1546 temp[di++]= src[si++]; | |
| 1547 } | |
| 1548 else | |
| 1549 temp[di++]= src[si++]; | |
| 1550 } | |
| 1551 memcpy(dst+1, temp, length+escape_count); | |
| 1552 | |
| 1553 assert(di == length+escape_count); | |
| 1554 | |
| 1555 return di + 1; | |
| 1556 } | |
| 1557 | |
| 1558 /** | |
| 1559 * write 1,10,100,1000,... for alignment, yes its exactly inverse to mpeg4 | |
| 1560 */ | |
| 1561 static void encode_rbsp_trailing(PutBitContext *pb){ | |
| 1562 int length; | |
| 1563 put_bits(pb, 1, 1); | |
| 1786 | 1564 length= (-put_bits_count(pb))&7; |
| 1168 | 1565 if(length) put_bits(pb, length, 0); |
| 1566 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1567 #endif |
| 1168 | 1568 |
| 1569 /** | |
| 1570 * identifies the exact end of the bitstream | |
| 1571 * @return the length of the trailing, or 0 if damaged | |
| 1572 */ | |
| 1573 static int decode_rbsp_trailing(uint8_t *src){ | |
| 1574 int v= *src; | |
| 1575 int r; | |
| 1576 | |
| 1170 | 1577 tprintf("rbsp trailing %X\n", v); |
| 1168 | 1578 |
| 1579 for(r=1; r<9; r++){ | |
| 1580 if(v&1) return r; | |
| 1581 v>>=1; | |
| 1582 } | |
| 1583 return 0; | |
| 1584 } | |
| 1585 | |
| 1586 /** | |
| 1587 * idct tranforms the 16 dc values and dequantize them. | |
| 1588 * @param qp quantization parameter | |
| 1589 */ | |
| 1590 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
| 1591 const int qmul= dequant_coeff[qp][0]; | |
| 1592 #define stride 16 | |
| 1593 int i; | |
| 1594 int temp[16]; //FIXME check if this is a good idea | |
| 1595 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
| 1596 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
| 1597 | |
| 1598 //memset(block, 64, 2*256); | |
| 1599 //return; | |
| 1600 for(i=0; i<4; i++){ | |
| 1601 const int offset= y_offset[i]; | |
| 1602 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
| 1603 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
| 1604 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
| 1605 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
| 1606 | |
| 1607 temp[4*i+0]= z0+z3; | |
| 1608 temp[4*i+1]= z1+z2; | |
| 1609 temp[4*i+2]= z1-z2; | |
| 1610 temp[4*i+3]= z0-z3; | |
| 1611 } | |
| 1612 | |
| 1613 for(i=0; i<4; i++){ | |
| 1614 const int offset= x_offset[i]; | |
| 1615 const int z0= temp[4*0+i] + temp[4*2+i]; | |
| 1616 const int z1= temp[4*0+i] - temp[4*2+i]; | |
| 1617 const int z2= temp[4*1+i] - temp[4*3+i]; | |
| 1618 const int z3= temp[4*1+i] + temp[4*3+i]; | |
| 1619 | |
| 1620 block[stride*0 +offset]= ((z0 + z3)*qmul + 2)>>2; //FIXME think about merging this into decode_resdual | |
| 1621 block[stride*2 +offset]= ((z1 + z2)*qmul + 2)>>2; | |
| 1622 block[stride*8 +offset]= ((z1 - z2)*qmul + 2)>>2; | |
| 1623 block[stride*10+offset]= ((z0 - z3)*qmul + 2)>>2; | |
| 1624 } | |
| 1625 } | |
| 1626 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1627 #if 0 |
| 1168 | 1628 /** |
| 1629 * dct tranforms the 16 dc values. | |
| 1630 * @param qp quantization parameter ??? FIXME | |
| 1631 */ | |
| 1632 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){ | |
| 1633 // const int qmul= dequant_coeff[qp][0]; | |
| 1634 int i; | |
| 1635 int temp[16]; //FIXME check if this is a good idea | |
| 1636 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
| 1637 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
| 1638 | |
| 1639 for(i=0; i<4; i++){ | |
| 1640 const int offset= y_offset[i]; | |
| 1641 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
| 1642 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
| 1643 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
| 1644 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
| 1645 | |
| 1646 temp[4*i+0]= z0+z3; | |
| 1647 temp[4*i+1]= z1+z2; | |
| 1648 temp[4*i+2]= z1-z2; | |
| 1649 temp[4*i+3]= z0-z3; | |
| 1650 } | |
| 1651 | |
| 1652 for(i=0; i<4; i++){ | |
| 1653 const int offset= x_offset[i]; | |
| 1654 const int z0= temp[4*0+i] + temp[4*2+i]; | |
| 1655 const int z1= temp[4*0+i] - temp[4*2+i]; | |
| 1656 const int z2= temp[4*1+i] - temp[4*3+i]; | |
| 1657 const int z3= temp[4*1+i] + temp[4*3+i]; | |
| 1658 | |
| 1659 block[stride*0 +offset]= (z0 + z3)>>1; | |
| 1660 block[stride*2 +offset]= (z1 + z2)>>1; | |
| 1661 block[stride*8 +offset]= (z1 - z2)>>1; | |
| 1662 block[stride*10+offset]= (z0 - z3)>>1; | |
| 1663 } | |
| 1664 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1665 #endif |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1666 |
| 1168 | 1667 #undef xStride |
| 1668 #undef stride | |
| 1669 | |
| 1670 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
| 1671 const int qmul= dequant_coeff[qp][0]; | |
| 1672 const int stride= 16*2; | |
| 1673 const int xStride= 16; | |
| 1674 int a,b,c,d,e; | |
| 1675 | |
| 1676 a= block[stride*0 + xStride*0]; | |
| 1677 b= block[stride*0 + xStride*1]; | |
| 1678 c= block[stride*1 + xStride*0]; | |
| 1679 d= block[stride*1 + xStride*1]; | |
| 1680 | |
| 1681 e= a-b; | |
| 1682 a= a+b; | |
| 1683 b= c-d; | |
| 1684 c= c+d; | |
| 1685 | |
| 1686 block[stride*0 + xStride*0]= ((a+c)*qmul + 0)>>1; | |
| 1687 block[stride*0 + xStride*1]= ((e+b)*qmul + 0)>>1; | |
| 1688 block[stride*1 + xStride*0]= ((a-c)*qmul + 0)>>1; | |
| 1689 block[stride*1 + xStride*1]= ((e-b)*qmul + 0)>>1; | |
| 1690 } | |
| 1691 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1692 #if 0 |
| 1168 | 1693 static void chroma_dc_dct_c(DCTELEM *block){ |
| 1694 const int stride= 16*2; | |
| 1695 const int xStride= 16; | |
| 1696 int a,b,c,d,e; | |
| 1697 | |
| 1698 a= block[stride*0 + xStride*0]; | |
| 1699 b= block[stride*0 + xStride*1]; | |
| 1700 c= block[stride*1 + xStride*0]; | |
| 1701 d= block[stride*1 + xStride*1]; | |
| 1702 | |
| 1703 e= a-b; | |
| 1704 a= a+b; | |
| 1705 b= c-d; | |
| 1706 c= c+d; | |
| 1707 | |
| 1708 block[stride*0 + xStride*0]= (a+c); | |
| 1709 block[stride*0 + xStride*1]= (e+b); | |
| 1710 block[stride*1 + xStride*0]= (a-c); | |
| 1711 block[stride*1 + xStride*1]= (e-b); | |
| 1712 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1713 #endif |
| 1168 | 1714 |
| 1715 /** | |
| 1716 * gets the chroma qp. | |
| 1717 */ | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
1718 static inline int get_chroma_qp(int chroma_qp_index_offset, int qscale){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
1719 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
1720 return chroma_qp[clip(qscale + chroma_qp_index_offset, 0, 51)]; |
| 1168 | 1721 } |
| 1722 | |
| 1723 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1724 #if 0 |
| 1168 | 1725 static void h264_diff_dct_c(DCTELEM *block, uint8_t *src1, uint8_t *src2, int stride){ |
| 1726 int i; | |
| 1727 //FIXME try int temp instead of block | |
| 1728 | |
| 1729 for(i=0; i<4; i++){ | |
| 1730 const int d0= src1[0 + i*stride] - src2[0 + i*stride]; | |
| 1731 const int d1= src1[1 + i*stride] - src2[1 + i*stride]; | |
| 1732 const int d2= src1[2 + i*stride] - src2[2 + i*stride]; | |
| 1733 const int d3= src1[3 + i*stride] - src2[3 + i*stride]; | |
| 1734 const int z0= d0 + d3; | |
| 1735 const int z3= d0 - d3; | |
| 1736 const int z1= d1 + d2; | |
| 1737 const int z2= d1 - d2; | |
| 1738 | |
| 1739 block[0 + 4*i]= z0 + z1; | |
| 1740 block[1 + 4*i]= 2*z3 + z2; | |
| 1741 block[2 + 4*i]= z0 - z1; | |
| 1742 block[3 + 4*i]= z3 - 2*z2; | |
| 1743 } | |
| 1744 | |
| 1745 for(i=0; i<4; i++){ | |
| 1746 const int z0= block[0*4 + i] + block[3*4 + i]; | |
| 1747 const int z3= block[0*4 + i] - block[3*4 + i]; | |
| 1748 const int z1= block[1*4 + i] + block[2*4 + i]; | |
| 1749 const int z2= block[1*4 + i] - block[2*4 + i]; | |
| 1750 | |
| 1751 block[0*4 + i]= z0 + z1; | |
| 1752 block[1*4 + i]= 2*z3 + z2; | |
| 1753 block[2*4 + i]= z0 - z1; | |
| 1754 block[3*4 + i]= z3 - 2*z2; | |
| 1755 } | |
| 1756 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1757 #endif |
| 1168 | 1758 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
1759 //FIXME need to check that this doesnt overflow signed 32 bit for low qp, i am not sure, it's very close |
| 1168 | 1760 //FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away) |
| 1761 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int seperate_dc){ | |
| 1762 int i; | |
| 1763 const int * const quant_table= quant_coeff[qscale]; | |
| 1764 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6; | |
| 1765 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1; | |
| 1766 const unsigned int threshold2= (threshold1<<1); | |
| 1767 int last_non_zero; | |
| 1768 | |
| 1769 if(seperate_dc){ | |
| 1770 if(qscale<=18){ | |
| 1771 //avoid overflows | |
| 1772 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6; | |
| 1773 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1; | |
| 1774 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
| 1775 | |
| 1776 int level= block[0]*quant_coeff[qscale+18][0]; | |
| 1777 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
| 1778 if(level>0){ | |
| 1779 level= (dc_bias + level)>>(QUANT_SHIFT-2); | |
| 1780 block[0]= level; | |
| 1781 }else{ | |
| 1782 level= (dc_bias - level)>>(QUANT_SHIFT-2); | |
| 1783 block[0]= -level; | |
| 1784 } | |
| 1785 // last_non_zero = i; | |
| 1786 }else{ | |
| 1787 block[0]=0; | |
| 1788 } | |
| 1789 }else{ | |
| 1790 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6; | |
| 1791 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1; | |
| 1792 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
| 1793 | |
| 1794 int level= block[0]*quant_table[0]; | |
| 1795 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
| 1796 if(level>0){ | |
| 1797 level= (dc_bias + level)>>(QUANT_SHIFT+1); | |
| 1798 block[0]= level; | |
| 1799 }else{ | |
| 1800 level= (dc_bias - level)>>(QUANT_SHIFT+1); | |
| 1801 block[0]= -level; | |
| 1802 } | |
| 1803 // last_non_zero = i; | |
| 1804 }else{ | |
| 1805 block[0]=0; | |
| 1806 } | |
| 1807 } | |
| 1808 last_non_zero= 0; | |
| 1809 i=1; | |
| 1810 }else{ | |
| 1811 last_non_zero= -1; | |
| 1812 i=0; | |
| 1813 } | |
| 1814 | |
| 1815 for(; i<16; i++){ | |
| 1816 const int j= scantable[i]; | |
| 1817 int level= block[j]*quant_table[j]; | |
| 1818 | |
| 1819 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
| 1820 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
| 1821 if(((unsigned)(level+threshold1))>threshold2){ | |
| 1822 if(level>0){ | |
| 1823 level= (bias + level)>>QUANT_SHIFT; | |
| 1824 block[j]= level; | |
| 1825 }else{ | |
| 1826 level= (bias - level)>>QUANT_SHIFT; | |
| 1827 block[j]= -level; | |
| 1828 } | |
| 1829 last_non_zero = i; | |
| 1830 }else{ | |
| 1831 block[j]=0; | |
| 1832 } | |
| 1833 } | |
| 1834 | |
| 1835 return last_non_zero; | |
| 1836 } | |
| 1837 | |
| 1838 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1839 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 1840 ((uint32_t*)(src+0*stride))[0]= a; | |
| 1841 ((uint32_t*)(src+1*stride))[0]= a; | |
| 1842 ((uint32_t*)(src+2*stride))[0]= a; | |
| 1843 ((uint32_t*)(src+3*stride))[0]= a; | |
| 1844 } | |
| 1845 | |
| 1846 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1847 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101; | |
| 1848 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101; | |
| 1849 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101; | |
| 1850 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101; | |
| 1851 } | |
| 1852 | |
| 1853 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1854 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] | |
| 1855 + src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 4) >>3; | |
| 1856 | |
| 1857 ((uint32_t*)(src+0*stride))[0]= | |
| 1858 ((uint32_t*)(src+1*stride))[0]= | |
| 1859 ((uint32_t*)(src+2*stride))[0]= | |
| 1860 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1861 } | |
| 1862 | |
| 1863 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1864 const int dc= ( src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 2) >>2; | |
| 1865 | |
| 1866 ((uint32_t*)(src+0*stride))[0]= | |
| 1867 ((uint32_t*)(src+1*stride))[0]= | |
| 1868 ((uint32_t*)(src+2*stride))[0]= | |
| 1869 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1870 } | |
| 1871 | |
| 1872 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1873 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2; | |
| 1874 | |
| 1875 ((uint32_t*)(src+0*stride))[0]= | |
| 1876 ((uint32_t*)(src+1*stride))[0]= | |
| 1877 ((uint32_t*)(src+2*stride))[0]= | |
| 1878 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1879 } | |
| 1880 | |
| 1881 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1882 ((uint32_t*)(src+0*stride))[0]= | |
| 1883 ((uint32_t*)(src+1*stride))[0]= | |
| 1884 ((uint32_t*)(src+2*stride))[0]= | |
| 1885 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U; | |
| 1886 } | |
| 1887 | |
| 1888 | |
| 1889 #define LOAD_TOP_RIGHT_EDGE\ | |
| 1890 const int t4= topright[0];\ | |
| 1891 const int t5= topright[1];\ | |
| 1892 const int t6= topright[2];\ | |
| 1893 const int t7= topright[3];\ | |
| 1894 | |
| 1895 #define LOAD_LEFT_EDGE\ | |
| 1896 const int l0= src[-1+0*stride];\ | |
| 1897 const int l1= src[-1+1*stride];\ | |
| 1898 const int l2= src[-1+2*stride];\ | |
| 1899 const int l3= src[-1+3*stride];\ | |
| 1900 | |
| 1901 #define LOAD_TOP_EDGE\ | |
| 1902 const int t0= src[ 0-1*stride];\ | |
| 1903 const int t1= src[ 1-1*stride];\ | |
| 1904 const int t2= src[ 2-1*stride];\ | |
| 1905 const int t3= src[ 3-1*stride];\ | |
| 1906 | |
| 1907 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1908 const int lt= src[-1-1*stride]; | |
| 1909 LOAD_TOP_EDGE | |
| 1910 LOAD_LEFT_EDGE | |
| 1911 | |
| 1912 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2; | |
| 1913 src[0+2*stride]= | |
| 1914 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2; | |
| 1915 src[0+1*stride]= | |
| 1916 src[1+2*stride]= | |
| 1917 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2; | |
| 1918 src[0+0*stride]= | |
| 1919 src[1+1*stride]= | |
| 1920 src[2+2*stride]= | |
| 1921 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1922 src[1+0*stride]= | |
| 1923 src[2+1*stride]= | |
| 1924 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1925 src[2+0*stride]= | |
| 1926 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1927 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1282 | 1928 } |
| 1168 | 1929 |
| 1930 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1931 LOAD_TOP_EDGE | |
| 1932 LOAD_TOP_RIGHT_EDGE | |
| 1933 // LOAD_LEFT_EDGE | |
| 1934 | |
| 1935 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2; | |
| 1936 src[1+0*stride]= | |
| 1937 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2; | |
| 1938 src[2+0*stride]= | |
| 1939 src[1+1*stride]= | |
| 1940 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2; | |
| 1941 src[3+0*stride]= | |
| 1942 src[2+1*stride]= | |
| 1943 src[1+2*stride]= | |
| 1944 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2; | |
| 1945 src[3+1*stride]= | |
| 1946 src[2+2*stride]= | |
| 1947 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2; | |
| 1948 src[3+2*stride]= | |
| 1949 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2; | |
| 1950 src[3+3*stride]=(t6 + 3*t7 + 2)>>2; | |
| 1282 | 1951 } |
| 1168 | 1952 |
| 1953 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1954 const int lt= src[-1-1*stride]; | |
| 1955 LOAD_TOP_EDGE | |
| 1956 LOAD_LEFT_EDGE | |
| 1957 const __attribute__((unused)) int unu= l3; | |
| 1958 | |
| 1959 src[0+0*stride]= | |
| 1960 src[1+2*stride]=(lt + t0 + 1)>>1; | |
| 1961 src[1+0*stride]= | |
| 1962 src[2+2*stride]=(t0 + t1 + 1)>>1; | |
| 1963 src[2+0*stride]= | |
| 1964 src[3+2*stride]=(t1 + t2 + 1)>>1; | |
| 1965 src[3+0*stride]=(t2 + t3 + 1)>>1; | |
| 1966 src[0+1*stride]= | |
| 1967 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1968 src[1+1*stride]= | |
| 1969 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1970 src[2+1*stride]= | |
| 1971 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1972 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1973 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
| 1974 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1282 | 1975 } |
| 1168 | 1976 |
| 1977 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1978 LOAD_TOP_EDGE | |
| 1979 LOAD_TOP_RIGHT_EDGE | |
| 1980 const __attribute__((unused)) int unu= t7; | |
| 1981 | |
| 1982 src[0+0*stride]=(t0 + t1 + 1)>>1; | |
| 1983 src[1+0*stride]= | |
| 1984 src[0+2*stride]=(t1 + t2 + 1)>>1; | |
| 1985 src[2+0*stride]= | |
| 1986 src[1+2*stride]=(t2 + t3 + 1)>>1; | |
| 1987 src[3+0*stride]= | |
| 1988 src[2+2*stride]=(t3 + t4+ 1)>>1; | |
| 1989 src[3+2*stride]=(t4 + t5+ 1)>>1; | |
| 1990 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1991 src[1+1*stride]= | |
| 1992 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1993 src[2+1*stride]= | |
| 1994 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2; | |
| 1995 src[3+1*stride]= | |
| 1996 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; | |
| 1997 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; | |
| 1282 | 1998 } |
| 1168 | 1999 |
| 2000 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 2001 LOAD_LEFT_EDGE | |
| 2002 | |
| 2003 src[0+0*stride]=(l0 + l1 + 1)>>1; | |
| 2004 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 2005 src[2+0*stride]= | |
| 2006 src[0+1*stride]=(l1 + l2 + 1)>>1; | |
| 2007 src[3+0*stride]= | |
| 2008 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
| 2009 src[2+1*stride]= | |
| 2010 src[0+2*stride]=(l2 + l3 + 1)>>1; | |
| 2011 src[3+1*stride]= | |
| 2012 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2; | |
| 2013 src[3+2*stride]= | |
| 2014 src[1+3*stride]= | |
| 2015 src[0+3*stride]= | |
| 2016 src[2+2*stride]= | |
| 2017 src[2+3*stride]= | |
| 2018 src[3+3*stride]=l3; | |
| 1282 | 2019 } |
| 1168 | 2020 |
| 2021 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 2022 const int lt= src[-1-1*stride]; | |
| 2023 LOAD_TOP_EDGE | |
| 2024 LOAD_LEFT_EDGE | |
| 2025 const __attribute__((unused)) int unu= t3; | |
| 2026 | |
| 2027 src[0+0*stride]= | |
| 2028 src[2+1*stride]=(lt + l0 + 1)>>1; | |
| 2029 src[1+0*stride]= | |
| 2030 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 2031 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 2032 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 2033 src[0+1*stride]= | |
| 2034 src[2+2*stride]=(l0 + l1 + 1)>>1; | |
| 2035 src[1+1*stride]= | |
| 2036 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
| 2037 src[0+2*stride]= | |
| 2038 src[2+3*stride]=(l1 + l2+ 1)>>1; | |
| 2039 src[1+2*stride]= | |
| 2040 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 2041 src[0+3*stride]=(l2 + l3 + 1)>>1; | |
| 2042 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
| 1282 | 2043 } |
| 1168 | 2044 |
| 2045 static void pred16x16_vertical_c(uint8_t *src, int stride){ | |
| 2046 int i; | |
| 2047 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 2048 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
| 2049 const uint32_t c= ((uint32_t*)(src-stride))[2]; | |
| 2050 const uint32_t d= ((uint32_t*)(src-stride))[3]; | |
| 2051 | |
| 2052 for(i=0; i<16; i++){ | |
| 2053 ((uint32_t*)(src+i*stride))[0]= a; | |
| 2054 ((uint32_t*)(src+i*stride))[1]= b; | |
| 2055 ((uint32_t*)(src+i*stride))[2]= c; | |
| 2056 ((uint32_t*)(src+i*stride))[3]= d; | |
| 2057 } | |
| 2058 } | |
| 2059 | |
| 2060 static void pred16x16_horizontal_c(uint8_t *src, int stride){ | |
| 2061 int i; | |
| 2062 | |
| 2063 for(i=0; i<16; i++){ | |
| 2064 ((uint32_t*)(src+i*stride))[0]= | |
| 2065 ((uint32_t*)(src+i*stride))[1]= | |
| 2066 ((uint32_t*)(src+i*stride))[2]= | |
| 2067 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101; | |
| 2068 } | |
| 2069 } | |
| 2070 | |
| 2071 static void pred16x16_dc_c(uint8_t *src, int stride){ | |
| 2072 int i, dc=0; | |
| 2073 | |
| 2074 for(i=0;i<16; i++){ | |
| 2075 dc+= src[-1+i*stride]; | |
| 2076 } | |
| 2077 | |
| 2078 for(i=0;i<16; i++){ | |
| 2079 dc+= src[i-stride]; | |
| 2080 } | |
| 2081 | |
| 2082 dc= 0x01010101*((dc + 16)>>5); | |
| 2083 | |
| 2084 for(i=0; i<16; i++){ | |
| 2085 ((uint32_t*)(src+i*stride))[0]= | |
| 2086 ((uint32_t*)(src+i*stride))[1]= | |
| 2087 ((uint32_t*)(src+i*stride))[2]= | |
| 2088 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 2089 } | |
| 2090 } | |
| 2091 | |
| 2092 static void pred16x16_left_dc_c(uint8_t *src, int stride){ | |
| 2093 int i, dc=0; | |
| 2094 | |
| 2095 for(i=0;i<16; i++){ | |
| 2096 dc+= src[-1+i*stride]; | |
| 2097 } | |
| 2098 | |
| 2099 dc= 0x01010101*((dc + 8)>>4); | |
| 2100 | |
| 2101 for(i=0; i<16; i++){ | |
| 2102 ((uint32_t*)(src+i*stride))[0]= | |
| 2103 ((uint32_t*)(src+i*stride))[1]= | |
| 2104 ((uint32_t*)(src+i*stride))[2]= | |
| 2105 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 2106 } | |
| 2107 } | |
| 2108 | |
| 2109 static void pred16x16_top_dc_c(uint8_t *src, int stride){ | |
| 2110 int i, dc=0; | |
| 2111 | |
| 2112 for(i=0;i<16; i++){ | |
| 2113 dc+= src[i-stride]; | |
| 2114 } | |
| 2115 dc= 0x01010101*((dc + 8)>>4); | |
| 2116 | |
| 2117 for(i=0; i<16; i++){ | |
| 2118 ((uint32_t*)(src+i*stride))[0]= | |
| 2119 ((uint32_t*)(src+i*stride))[1]= | |
| 2120 ((uint32_t*)(src+i*stride))[2]= | |
| 2121 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 2122 } | |
| 2123 } | |
| 2124 | |
| 2125 static void pred16x16_128_dc_c(uint8_t *src, int stride){ | |
| 2126 int i; | |
| 2127 | |
| 2128 for(i=0; i<16; i++){ | |
| 2129 ((uint32_t*)(src+i*stride))[0]= | |
| 2130 ((uint32_t*)(src+i*stride))[1]= | |
| 2131 ((uint32_t*)(src+i*stride))[2]= | |
| 2132 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U; | |
| 2133 } | |
| 2134 } | |
| 2135 | |
| 1234 | 2136 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
|
2137 int i, j, k; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2138 int a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2139 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
|
2140 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
|
2141 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
|
2142 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
|
2143 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
|
2144 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
|
2145 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
|
2146 src1 += stride; src2 -= stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2147 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
|
2148 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
|
2149 } |
| 1234 | 2150 if(svq3){ |
| 2151 H = ( 5*(H/4) ) / 16; | |
| 2152 V = ( 5*(V/4) ) / 16; | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2153 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2154 /* required for 100% accuracy */ |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2155 i = H; H = V; V = i; |
| 1234 | 2156 }else{ |
| 2157 H = ( 5*H+32 ) >> 6; | |
| 2158 V = ( 5*V+32 ) >> 6; | |
| 2159 } | |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2160 |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2161 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
|
2162 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
|
2163 int b = a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2164 a += V; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2165 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
|
2166 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
|
2167 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
|
2168 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
|
2169 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
|
2170 b += 4*H; |
| 1168 | 2171 } |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2172 src += stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2173 } |
| 1168 | 2174 } |
| 2175 | |
| 1234 | 2176 static void pred16x16_plane_c(uint8_t *src, int stride){ |
| 2177 pred16x16_plane_compat_c(src, stride, 0); | |
| 2178 } | |
| 2179 | |
| 1168 | 2180 static void pred8x8_vertical_c(uint8_t *src, int stride){ |
| 2181 int i; | |
| 2182 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 2183 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
| 2184 | |
| 2185 for(i=0; i<8; i++){ | |
| 2186 ((uint32_t*)(src+i*stride))[0]= a; | |
| 2187 ((uint32_t*)(src+i*stride))[1]= b; | |
| 2188 } | |
| 2189 } | |
| 2190 | |
| 2191 static void pred8x8_horizontal_c(uint8_t *src, int stride){ | |
| 2192 int i; | |
| 2193 | |
| 2194 for(i=0; i<8; i++){ | |
| 2195 ((uint32_t*)(src+i*stride))[0]= | |
| 2196 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101; | |
| 2197 } | |
| 2198 } | |
| 2199 | |
| 2200 static void pred8x8_128_dc_c(uint8_t *src, int stride){ | |
| 2201 int i; | |
| 2202 | |
| 2755 | 2203 for(i=0; i<8; i++){ |
| 1168 | 2204 ((uint32_t*)(src+i*stride))[0]= |
| 2205 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; | |
| 2206 } | |
| 2207 } | |
| 2208 | |
| 2209 static void pred8x8_left_dc_c(uint8_t *src, int stride){ | |
| 2210 int i; | |
| 2211 int dc0, dc2; | |
| 2212 | |
| 2213 dc0=dc2=0; | |
| 2214 for(i=0;i<4; i++){ | |
| 2215 dc0+= src[-1+i*stride]; | |
| 2216 dc2+= src[-1+(i+4)*stride]; | |
| 2217 } | |
| 2218 dc0= 0x01010101*((dc0 + 2)>>2); | |
| 2219 dc2= 0x01010101*((dc2 + 2)>>2); | |
| 2220 | |
| 2221 for(i=0; i<4; i++){ | |
| 2222 ((uint32_t*)(src+i*stride))[0]= | |
| 2223 ((uint32_t*)(src+i*stride))[1]= dc0; | |
| 2224 } | |
| 2225 for(i=4; i<8; i++){ | |
| 2226 ((uint32_t*)(src+i*stride))[0]= | |
| 2227 ((uint32_t*)(src+i*stride))[1]= dc2; | |
| 2228 } | |
| 2229 } | |
| 2230 | |
| 2231 static void pred8x8_top_dc_c(uint8_t *src, int stride){ | |
| 2232 int i; | |
| 2233 int dc0, dc1; | |
| 2234 | |
| 2235 dc0=dc1=0; | |
| 2236 for(i=0;i<4; i++){ | |
| 2237 dc0+= src[i-stride]; | |
| 2238 dc1+= src[4+i-stride]; | |
| 2239 } | |
| 2240 dc0= 0x01010101*((dc0 + 2)>>2); | |
| 2241 dc1= 0x01010101*((dc1 + 2)>>2); | |
| 2242 | |
| 2243 for(i=0; i<4; i++){ | |
| 2244 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2245 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2246 } | |
| 2247 for(i=4; i<8; i++){ | |
| 2248 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2249 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2250 } | |
| 2251 } | |
| 2252 | |
| 2253 | |
| 2254 static void pred8x8_dc_c(uint8_t *src, int stride){ | |
| 2255 int i; | |
| 2256 int dc0, dc1, dc2, dc3; | |
| 2257 | |
| 2258 dc0=dc1=dc2=0; | |
| 2259 for(i=0;i<4; i++){ | |
| 2260 dc0+= src[-1+i*stride] + src[i-stride]; | |
| 2261 dc1+= src[4+i-stride]; | |
| 2262 dc2+= src[-1+(i+4)*stride]; | |
| 2263 } | |
| 2264 dc3= 0x01010101*((dc1 + dc2 + 4)>>3); | |
| 2265 dc0= 0x01010101*((dc0 + 4)>>3); | |
| 2266 dc1= 0x01010101*((dc1 + 2)>>2); | |
| 2267 dc2= 0x01010101*((dc2 + 2)>>2); | |
| 2268 | |
| 2269 for(i=0; i<4; i++){ | |
| 2270 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2271 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2272 } | |
| 2273 for(i=4; i<8; i++){ | |
| 2274 ((uint32_t*)(src+i*stride))[0]= dc2; | |
| 2275 ((uint32_t*)(src+i*stride))[1]= dc3; | |
| 2276 } | |
| 2277 } | |
| 2278 | |
| 2279 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
|
2280 int j, k; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2281 int a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2282 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
|
2283 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
|
2284 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
|
2285 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
|
2286 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
|
2287 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
|
2288 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
|
2289 src1 += stride; src2 -= stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2290 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
|
2291 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
|
2292 } |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2293 H = ( 17*H+16 ) >> 5; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2294 V = ( 17*V+16 ) >> 5; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2295 |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2296 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
|
2297 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
|
2298 int b = a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2299 a += V; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2300 src[0] = cm[ (b ) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2301 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
|
2302 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
|
2303 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
|
2304 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
|
2305 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
|
2306 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
|
2307 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
|
2308 src += stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2309 } |
| 1168 | 2310 } |
| 2311 | |
| 2755 | 2312 #define SRC(x,y) src[(x)+(y)*stride] |
| 2313 #define PL(y) \ | |
| 2314 const int l##y = (SRC(-1,y-1) + 2*SRC(-1,y) + SRC(-1,y+1) + 2) >> 2; | |
| 2315 #define PREDICT_8x8_LOAD_LEFT \ | |
| 2316 const int l0 = ((has_topleft ? SRC(-1,-1) : SRC(-1,0)) \ | |
| 2317 + 2*SRC(-1,0) + SRC(-1,1) + 2) >> 2; \ | |
| 2318 PL(1) PL(2) PL(3) PL(4) PL(5) PL(6) \ | |
| 2757 | 2319 const int l7 = (SRC(-1,6) + 3*SRC(-1,7) + 2) >> 2 |
| 2755 | 2320 |
| 2321 #define PT(x) \ | |
| 2322 const int t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2; | |
| 2323 #define PREDICT_8x8_LOAD_TOP \ | |
| 2324 const int t0 = ((has_topleft ? SRC(-1,-1) : SRC(0,-1)) \ | |
| 2325 + 2*SRC(0,-1) + SRC(1,-1) + 2) >> 2; \ | |
| 2326 PT(1) PT(2) PT(3) PT(4) PT(5) PT(6) \ | |
| 2327 const int t7 = ((has_topright ? SRC(8,-1) : SRC(7,-1)) \ | |
| 2757 | 2328 + 2*SRC(7,-1) + SRC(6,-1) + 2) >> 2 |
| 2755 | 2329 |
| 2330 #define PTR(x) \ | |
| 2331 t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2; | |
| 2332 #define PREDICT_8x8_LOAD_TOPRIGHT \ | |
| 2333 int t8, t9, t10, t11, t12, t13, t14, t15; \ | |
| 2334 if(has_topright) { \ | |
| 2335 PTR(8) PTR(9) PTR(10) PTR(11) PTR(12) PTR(13) PTR(14) \ | |
| 2336 t15 = (SRC(14,-1) + 3*SRC(15,-1) + 2) >> 2; \ | |
| 2337 } else t8=t9=t10=t11=t12=t13=t14=t15= SRC(7,-1); | |
| 2338 | |
| 2339 #define PREDICT_8x8_LOAD_TOPLEFT \ | |
| 2757 | 2340 const int lt = (SRC(-1,0) + 2*SRC(-1,-1) + SRC(0,-1) + 2) >> 2 |
| 2755 | 2341 |
| 2342 #define PREDICT_8x8_DC(v) \ | |
| 2343 int y; \ | |
| 2344 for( y = 0; y < 8; y++ ) { \ | |
| 2345 ((uint32_t*)src)[0] = \ | |
| 2346 ((uint32_t*)src)[1] = v; \ | |
| 2347 src += stride; \ | |
| 2348 } | |
| 2349 | |
| 2350 static void pred8x8l_128_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2351 { | |
| 2352 PREDICT_8x8_DC(0x80808080); | |
| 2353 } | |
| 2354 static void pred8x8l_left_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2355 { | |
| 2356 PREDICT_8x8_LOAD_LEFT; | |
| 2357 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7+4) >> 3) * 0x01010101; | |
| 2358 PREDICT_8x8_DC(dc); | |
| 2359 } | |
| 2360 static void pred8x8l_top_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2361 { | |
| 2362 PREDICT_8x8_LOAD_TOP; | |
| 2363 const uint32_t dc = ((t0+t1+t2+t3+t4+t5+t6+t7+4) >> 3) * 0x01010101; | |
| 2364 PREDICT_8x8_DC(dc); | |
| 2365 } | |
| 2366 static void pred8x8l_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2367 { | |
| 2368 PREDICT_8x8_LOAD_LEFT; | |
| 2369 PREDICT_8x8_LOAD_TOP; | |
| 2370 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7 | |
| 2371 +t0+t1+t2+t3+t4+t5+t6+t7+8) >> 4) * 0x01010101; | |
| 2372 PREDICT_8x8_DC(dc); | |
| 2373 } | |
| 2374 static void pred8x8l_horizontal_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2375 { | |
| 2376 PREDICT_8x8_LOAD_LEFT; | |
| 2377 #define ROW(y) ((uint32_t*)(src+y*stride))[0] =\ | |
| 2378 ((uint32_t*)(src+y*stride))[1] = 0x01010101 * l##y | |
| 2379 ROW(0); ROW(1); ROW(2); ROW(3); ROW(4); ROW(5); ROW(6); ROW(7); | |
| 2380 #undef ROW | |
| 2381 } | |
| 2382 static void pred8x8l_vertical_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2383 { | |
| 2384 int y; | |
| 2385 PREDICT_8x8_LOAD_TOP; | |
| 2386 src[0] = t0; | |
| 2387 src[1] = t1; | |
| 2388 src[2] = t2; | |
| 2389 src[3] = t3; | |
| 2390 src[4] = t4; | |
| 2391 src[5] = t5; | |
| 2392 src[6] = t6; | |
| 2393 src[7] = t7; | |
| 2394 for( y = 1; y < 8; y++ ) | |
| 2395 *(uint64_t*)(src+y*stride) = *(uint64_t*)src; | |
| 2396 } | |
| 2397 static void pred8x8l_down_left_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2398 { | |
| 2399 PREDICT_8x8_LOAD_TOP; | |
| 2400 PREDICT_8x8_LOAD_TOPRIGHT; | |
| 2401 SRC(0,0)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2402 SRC(0,1)=SRC(1,0)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2403 SRC(0,2)=SRC(1,1)=SRC(2,0)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2404 SRC(0,3)=SRC(1,2)=SRC(2,1)=SRC(3,0)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2405 SRC(0,4)=SRC(1,3)=SRC(2,2)=SRC(3,1)=SRC(4,0)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2406 SRC(0,5)=SRC(1,4)=SRC(2,3)=SRC(3,2)=SRC(4,1)=SRC(5,0)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2407 SRC(0,6)=SRC(1,5)=SRC(2,4)=SRC(3,3)=SRC(4,2)=SRC(5,1)=SRC(6,0)= (t6 + 2*t7 + t8 + 2) >> 2; | |
| 2408 SRC(0,7)=SRC(1,6)=SRC(2,5)=SRC(3,4)=SRC(4,3)=SRC(5,2)=SRC(6,1)=SRC(7,0)= (t7 + 2*t8 + t9 + 2) >> 2; | |
| 2409 SRC(1,7)=SRC(2,6)=SRC(3,5)=SRC(4,4)=SRC(5,3)=SRC(6,2)=SRC(7,1)= (t8 + 2*t9 + t10 + 2) >> 2; | |
| 2410 SRC(2,7)=SRC(3,6)=SRC(4,5)=SRC(5,4)=SRC(6,3)=SRC(7,2)= (t9 + 2*t10 + t11 + 2) >> 2; | |
| 2411 SRC(3,7)=SRC(4,6)=SRC(5,5)=SRC(6,4)=SRC(7,3)= (t10 + 2*t11 + t12 + 2) >> 2; | |
| 2412 SRC(4,7)=SRC(5,6)=SRC(6,5)=SRC(7,4)= (t11 + 2*t12 + t13 + 2) >> 2; | |
| 2413 SRC(5,7)=SRC(6,6)=SRC(7,5)= (t12 + 2*t13 + t14 + 2) >> 2; | |
| 2414 SRC(6,7)=SRC(7,6)= (t13 + 2*t14 + t15 + 2) >> 2; | |
| 2415 SRC(7,7)= (t14 + 3*t15 + 2) >> 2; | |
| 2416 } | |
| 2417 static void pred8x8l_down_right_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2418 { | |
| 2419 PREDICT_8x8_LOAD_TOP; | |
| 2420 PREDICT_8x8_LOAD_LEFT; | |
| 2421 PREDICT_8x8_LOAD_TOPLEFT; | |
| 2422 SRC(0,7)= (l7 + 2*l6 + l5 + 2) >> 2; | |
| 2423 SRC(0,6)=SRC(1,7)= (l6 + 2*l5 + l4 + 2) >> 2; | |
| 2424 SRC(0,5)=SRC(1,6)=SRC(2,7)= (l5 + 2*l4 + l3 + 2) >> 2; | |
| 2425 SRC(0,4)=SRC(1,5)=SRC(2,6)=SRC(3,7)= (l4 + 2*l3 + l2 + 2) >> 2; | |
| 2426 SRC(0,3)=SRC(1,4)=SRC(2,5)=SRC(3,6)=SRC(4,7)= (l3 + 2*l2 + l1 + 2) >> 2; | |
| 2427 SRC(0,2)=SRC(1,3)=SRC(2,4)=SRC(3,5)=SRC(4,6)=SRC(5,7)= (l2 + 2*l1 + l0 + 2) >> 2; | |
| 2428 SRC(0,1)=SRC(1,2)=SRC(2,3)=SRC(3,4)=SRC(4,5)=SRC(5,6)=SRC(6,7)= (l1 + 2*l0 + lt + 2) >> 2; | |
| 2429 SRC(0,0)=SRC(1,1)=SRC(2,2)=SRC(3,3)=SRC(4,4)=SRC(5,5)=SRC(6,6)=SRC(7,7)= (l0 + 2*lt + t0 + 2) >> 2; | |
| 2430 SRC(1,0)=SRC(2,1)=SRC(3,2)=SRC(4,3)=SRC(5,4)=SRC(6,5)=SRC(7,6)= (lt + 2*t0 + t1 + 2) >> 2; | |
| 2431 SRC(2,0)=SRC(3,1)=SRC(4,2)=SRC(5,3)=SRC(6,4)=SRC(7,5)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2432 SRC(3,0)=SRC(4,1)=SRC(5,2)=SRC(6,3)=SRC(7,4)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2433 SRC(4,0)=SRC(5,1)=SRC(6,2)=SRC(7,3)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2434 SRC(5,0)=SRC(6,1)=SRC(7,2)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2435 SRC(6,0)=SRC(7,1)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2436 SRC(7,0)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2437 | |
| 2438 } | |
| 2439 static void pred8x8l_vertical_right_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2440 { | |
| 2441 PREDICT_8x8_LOAD_TOP; | |
| 2442 PREDICT_8x8_LOAD_LEFT; | |
| 2443 PREDICT_8x8_LOAD_TOPLEFT; | |
| 2444 SRC(0,6)= (l5 + 2*l4 + l3 + 2) >> 2; | |
| 2445 SRC(0,7)= (l6 + 2*l5 + l4 + 2) >> 2; | |
| 2446 SRC(0,4)=SRC(1,6)= (l3 + 2*l2 + l1 + 2) >> 2; | |
| 2447 SRC(0,5)=SRC(1,7)= (l4 + 2*l3 + l2 + 2) >> 2; | |
| 2448 SRC(0,2)=SRC(1,4)=SRC(2,6)= (l1 + 2*l0 + lt + 2) >> 2; | |
| 2449 SRC(0,3)=SRC(1,5)=SRC(2,7)= (l2 + 2*l1 + l0 + 2) >> 2; | |
| 2450 SRC(0,1)=SRC(1,3)=SRC(2,5)=SRC(3,7)= (l0 + 2*lt + t0 + 2) >> 2; | |
| 2451 SRC(0,0)=SRC(1,2)=SRC(2,4)=SRC(3,6)= (lt + t0 + 1) >> 1; | |
| 2452 SRC(1,1)=SRC(2,3)=SRC(3,5)=SRC(4,7)= (lt + 2*t0 + t1 + 2) >> 2; | |
| 2453 SRC(1,0)=SRC(2,2)=SRC(3,4)=SRC(4,6)= (t0 + t1 + 1) >> 1; | |
| 2454 SRC(2,1)=SRC(3,3)=SRC(4,5)=SRC(5,7)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2455 SRC(2,0)=SRC(3,2)=SRC(4,4)=SRC(5,6)= (t1 + t2 + 1) >> 1; | |
| 2456 SRC(3,1)=SRC(4,3)=SRC(5,5)=SRC(6,7)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2457 SRC(3,0)=SRC(4,2)=SRC(5,4)=SRC(6,6)= (t2 + t3 + 1) >> 1; | |
| 2458 SRC(4,1)=SRC(5,3)=SRC(6,5)=SRC(7,7)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2459 SRC(4,0)=SRC(5,2)=SRC(6,4)=SRC(7,6)= (t3 + t4 + 1) >> 1; | |
| 2460 SRC(5,1)=SRC(6,3)=SRC(7,5)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2461 SRC(5,0)=SRC(6,2)=SRC(7,4)= (t4 + t5 + 1) >> 1; | |
| 2462 SRC(6,1)=SRC(7,3)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2463 SRC(6,0)=SRC(7,2)= (t5 + t6 + 1) >> 1; | |
| 2464 SRC(7,1)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2465 SRC(7,0)= (t6 + t7 + 1) >> 1; | |
| 2466 } | |
| 2467 static void pred8x8l_horizontal_down_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2468 { | |
| 2469 PREDICT_8x8_LOAD_TOP; | |
| 2470 PREDICT_8x8_LOAD_LEFT; | |
| 2471 PREDICT_8x8_LOAD_TOPLEFT; | |
| 2472 SRC(0,7)= (l6 + l7 + 1) >> 1; | |
| 2473 SRC(1,7)= (l5 + 2*l6 + l7 + 2) >> 2; | |
| 2474 SRC(0,6)=SRC(2,7)= (l5 + l6 + 1) >> 1; | |
| 2475 SRC(1,6)=SRC(3,7)= (l4 + 2*l5 + l6 + 2) >> 2; | |
| 2476 SRC(0,5)=SRC(2,6)=SRC(4,7)= (l4 + l5 + 1) >> 1; | |
| 2477 SRC(1,5)=SRC(3,6)=SRC(5,7)= (l3 + 2*l4 + l5 + 2) >> 2; | |
| 2478 SRC(0,4)=SRC(2,5)=SRC(4,6)=SRC(6,7)= (l3 + l4 + 1) >> 1; | |
| 2479 SRC(1,4)=SRC(3,5)=SRC(5,6)=SRC(7,7)= (l2 + 2*l3 + l4 + 2) >> 2; | |
| 2480 SRC(0,3)=SRC(2,4)=SRC(4,5)=SRC(6,6)= (l2 + l3 + 1) >> 1; | |
| 2481 SRC(1,3)=SRC(3,4)=SRC(5,5)=SRC(7,6)= (l1 + 2*l2 + l3 + 2) >> 2; | |
| 2482 SRC(0,2)=SRC(2,3)=SRC(4,4)=SRC(6,5)= (l1 + l2 + 1) >> 1; | |
| 2483 SRC(1,2)=SRC(3,3)=SRC(5,4)=SRC(7,5)= (l0 + 2*l1 + l2 + 2) >> 2; | |
| 2484 SRC(0,1)=SRC(2,2)=SRC(4,3)=SRC(6,4)= (l0 + l1 + 1) >> 1; | |
| 2485 SRC(1,1)=SRC(3,2)=SRC(5,3)=SRC(7,4)= (lt + 2*l0 + l1 + 2) >> 2; | |
| 2486 SRC(0,0)=SRC(2,1)=SRC(4,2)=SRC(6,3)= (lt + l0 + 1) >> 1; | |
| 2487 SRC(1,0)=SRC(3,1)=SRC(5,2)=SRC(7,3)= (l0 + 2*lt + t0 + 2) >> 2; | |
| 2488 SRC(2,0)=SRC(4,1)=SRC(6,2)= (t1 + 2*t0 + lt + 2) >> 2; | |
| 2489 SRC(3,0)=SRC(5,1)=SRC(7,2)= (t2 + 2*t1 + t0 + 2) >> 2; | |
| 2490 SRC(4,0)=SRC(6,1)= (t3 + 2*t2 + t1 + 2) >> 2; | |
| 2491 SRC(5,0)=SRC(7,1)= (t4 + 2*t3 + t2 + 2) >> 2; | |
| 2492 SRC(6,0)= (t5 + 2*t4 + t3 + 2) >> 2; | |
| 2493 SRC(7,0)= (t6 + 2*t5 + t4 + 2) >> 2; | |
| 2494 } | |
| 2495 static void pred8x8l_vertical_left_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2496 { | |
| 2497 PREDICT_8x8_LOAD_TOP; | |
| 2498 PREDICT_8x8_LOAD_TOPRIGHT; | |
| 2499 SRC(0,0)= (t0 + t1 + 1) >> 1; | |
| 2500 SRC(0,1)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2501 SRC(0,2)=SRC(1,0)= (t1 + t2 + 1) >> 1; | |
| 2502 SRC(0,3)=SRC(1,1)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2503 SRC(0,4)=SRC(1,2)=SRC(2,0)= (t2 + t3 + 1) >> 1; | |
| 2504 SRC(0,5)=SRC(1,3)=SRC(2,1)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2505 SRC(0,6)=SRC(1,4)=SRC(2,2)=SRC(3,0)= (t3 + t4 + 1) >> 1; | |
| 2506 SRC(0,7)=SRC(1,5)=SRC(2,3)=SRC(3,1)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2507 SRC(1,6)=SRC(2,4)=SRC(3,2)=SRC(4,0)= (t4 + t5 + 1) >> 1; | |
| 2508 SRC(1,7)=SRC(2,5)=SRC(3,3)=SRC(4,1)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2509 SRC(2,6)=SRC(3,4)=SRC(4,2)=SRC(5,0)= (t5 + t6 + 1) >> 1; | |
| 2510 SRC(2,7)=SRC(3,5)=SRC(4,3)=SRC(5,1)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2511 SRC(3,6)=SRC(4,4)=SRC(5,2)=SRC(6,0)= (t6 + t7 + 1) >> 1; | |
| 2512 SRC(3,7)=SRC(4,5)=SRC(5,3)=SRC(6,1)= (t6 + 2*t7 + t8 + 2) >> 2; | |
| 2513 SRC(4,6)=SRC(5,4)=SRC(6,2)=SRC(7,0)= (t7 + t8 + 1) >> 1; | |
| 2514 SRC(4,7)=SRC(5,5)=SRC(6,3)=SRC(7,1)= (t7 + 2*t8 + t9 + 2) >> 2; | |
| 2515 SRC(5,6)=SRC(6,4)=SRC(7,2)= (t8 + t9 + 1) >> 1; | |
| 2516 SRC(5,7)=SRC(6,5)=SRC(7,3)= (t8 + 2*t9 + t10 + 2) >> 2; | |
| 2517 SRC(6,6)=SRC(7,4)= (t9 + t10 + 1) >> 1; | |
| 2518 SRC(6,7)=SRC(7,5)= (t9 + 2*t10 + t11 + 2) >> 2; | |
| 2519 SRC(7,6)= (t10 + t11 + 1) >> 1; | |
| 2520 SRC(7,7)= (t10 + 2*t11 + t12 + 2) >> 2; | |
| 2521 } | |
| 2522 static void pred8x8l_horizontal_up_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2523 { | |
| 2524 PREDICT_8x8_LOAD_LEFT; | |
| 2525 SRC(0,0)= (l0 + l1 + 1) >> 1; | |
| 2526 SRC(1,0)= (l0 + 2*l1 + l2 + 2) >> 2; | |
| 2527 SRC(0,1)=SRC(2,0)= (l1 + l2 + 1) >> 1; | |
| 2528 SRC(1,1)=SRC(3,0)= (l1 + 2*l2 + l3 + 2) >> 2; | |
| 2529 SRC(0,2)=SRC(2,1)=SRC(4,0)= (l2 + l3 + 1) >> 1; | |
| 2530 SRC(1,2)=SRC(3,1)=SRC(5,0)= (l2 + 2*l3 + l4 + 2) >> 2; | |
| 2531 SRC(0,3)=SRC(2,2)=SRC(4,1)=SRC(6,0)= (l3 + l4 + 1) >> 1; | |
| 2532 SRC(1,3)=SRC(3,2)=SRC(5,1)=SRC(7,0)= (l3 + 2*l4 + l5 + 2) >> 2; | |
| 2533 SRC(0,4)=SRC(2,3)=SRC(4,2)=SRC(6,1)= (l4 + l5 + 1) >> 1; | |
| 2534 SRC(1,4)=SRC(3,3)=SRC(5,2)=SRC(7,1)= (l4 + 2*l5 + l6 + 2) >> 2; | |
| 2535 SRC(0,5)=SRC(2,4)=SRC(4,3)=SRC(6,2)= (l5 + l6 + 1) >> 1; | |
| 2536 SRC(1,5)=SRC(3,4)=SRC(5,3)=SRC(7,2)= (l5 + 2*l6 + l7 + 2) >> 2; | |
| 2537 SRC(0,6)=SRC(2,5)=SRC(4,4)=SRC(6,3)= (l6 + l7 + 1) >> 1; | |
| 2538 SRC(1,6)=SRC(3,5)=SRC(5,4)=SRC(7,3)= (l6 + 3*l7 + 2) >> 2; | |
| 2539 SRC(0,7)=SRC(1,7)=SRC(2,6)=SRC(2,7)=SRC(3,6)= | |
| 2540 SRC(3,7)=SRC(4,5)=SRC(4,6)=SRC(4,7)=SRC(5,5)= | |
| 2541 SRC(5,6)=SRC(5,7)=SRC(6,4)=SRC(6,5)=SRC(6,6)= | |
| 2542 SRC(6,7)=SRC(7,4)=SRC(7,5)=SRC(7,6)=SRC(7,7)= l7; | |
| 2543 } | |
| 2544 #undef PREDICT_8x8_LOAD_LEFT | |
| 2545 #undef PREDICT_8x8_LOAD_TOP | |
| 2546 #undef PREDICT_8x8_LOAD_TOPLEFT | |
| 2547 #undef PREDICT_8x8_LOAD_TOPRIGHT | |
| 2548 #undef PREDICT_8x8_DC | |
| 2549 #undef PTR | |
| 2550 #undef PT | |
| 2551 #undef PL | |
| 2552 #undef SRC | |
| 2553 | |
| 1168 | 2554 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list, |
| 2555 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2556 int src_x_offset, int src_y_offset, | |
| 2557 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){ | |
| 2558 MpegEncContext * const s = &h->s; | |
| 2559 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8; | |
| 2560 const int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8; | |
| 2561 const int luma_xy= (mx&3) + ((my&3)<<2); | |
| 2562 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*s->linesize; | |
| 2563 uint8_t * src_cb= pic->data[1] + (mx>>3) + (my>>3)*s->uvlinesize; | |
| 2564 uint8_t * src_cr= pic->data[2] + (mx>>3) + (my>>3)*s->uvlinesize; | |
| 2565 int extra_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; //FIXME increase edge?, IMHO not worth it | |
| 2566 int extra_height= extra_width; | |
| 2567 int emu=0; | |
| 2568 const int full_mx= mx>>2; | |
| 2569 const int full_my= my>>2; | |
| 2570 | |
| 2571 assert(pic->data[0]); | |
| 2572 | |
| 2573 if(mx&7) extra_width -= 3; | |
| 2574 if(my&7) extra_height -= 3; | |
| 2575 | |
| 2576 if( full_mx < 0-extra_width | |
| 2577 || full_my < 0-extra_height | |
| 2578 || full_mx + 16/*FIXME*/ > s->width + extra_width | |
| 2579 || full_my + 16/*FIXME*/ > s->height + extra_height){ | |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
2580 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 | 2581 src_y= s->edge_emu_buffer + 2 + 2*s->linesize; |
| 2582 emu=1; | |
| 2583 } | |
| 2584 | |
| 2585 qpix_op[luma_xy](dest_y, src_y, s->linesize); //FIXME try variable height perhaps? | |
| 2586 if(!square){ | |
| 2587 qpix_op[luma_xy](dest_y + delta, src_y + delta, s->linesize); | |
| 2588 } | |
| 2589 | |
| 2590 if(s->flags&CODEC_FLAG_GRAY) return; | |
| 2591 | |
| 2592 if(emu){ | |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
2593 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 | 2594 src_cb= s->edge_emu_buffer; |
| 2595 } | |
| 2596 chroma_op(dest_cb, src_cb, s->uvlinesize, chroma_height, mx&7, my&7); | |
| 2597 | |
| 2598 if(emu){ | |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
2599 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 | 2600 src_cr= s->edge_emu_buffer; |
| 2601 } | |
| 2602 chroma_op(dest_cr, src_cr, s->uvlinesize, chroma_height, mx&7, my&7); | |
| 2603 } | |
| 2604 | |
| 2415 | 2605 static inline void mc_part_std(H264Context *h, int n, int square, int chroma_height, int delta, |
| 1168 | 2606 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
| 2607 int x_offset, int y_offset, | |
| 2608 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2609 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
| 2610 int list0, int list1){ | |
| 2611 MpegEncContext * const s = &h->s; | |
| 2612 qpel_mc_func *qpix_op= qpix_put; | |
| 2613 h264_chroma_mc_func chroma_op= chroma_put; | |
| 2614 | |
| 2615 dest_y += 2*x_offset + 2*y_offset*s-> linesize; | |
| 2616 dest_cb += x_offset + y_offset*s->uvlinesize; | |
| 2617 dest_cr += x_offset + y_offset*s->uvlinesize; | |
| 2618 x_offset += 8*s->mb_x; | |
| 2619 y_offset += 8*s->mb_y; | |
| 2620 | |
| 2621 if(list0){ | |
| 1169 | 2622 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ]; |
| 1168 | 2623 mc_dir_part(h, ref, n, square, chroma_height, delta, 0, |
| 2624 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2625 qpix_op, chroma_op); | |
| 2626 | |
| 2627 qpix_op= qpix_avg; | |
| 2628 chroma_op= chroma_avg; | |
| 2629 } | |
| 2630 | |
| 2631 if(list1){ | |
| 1169 | 2632 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ]; |
| 1168 | 2633 mc_dir_part(h, ref, n, square, chroma_height, delta, 1, |
| 2634 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2635 qpix_op, chroma_op); | |
| 2636 } | |
| 2637 } | |
| 2638 | |
| 2415 | 2639 static inline void mc_part_weighted(H264Context *h, int n, int square, int chroma_height, int delta, |
| 2640 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2641 int x_offset, int y_offset, | |
| 2642 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2643 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op, | |
| 2644 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg, | |
| 2645 int list0, int list1){ | |
| 2646 MpegEncContext * const s = &h->s; | |
| 2647 | |
| 2648 dest_y += 2*x_offset + 2*y_offset*s-> linesize; | |
| 2649 dest_cb += x_offset + y_offset*s->uvlinesize; | |
| 2650 dest_cr += x_offset + y_offset*s->uvlinesize; | |
| 2651 x_offset += 8*s->mb_x; | |
| 2652 y_offset += 8*s->mb_y; | |
| 2653 | |
| 2654 if(list0 && list1){ | |
| 2655 /* don't optimize for luma-only case, since B-frames usually | |
| 2656 * use implicit weights => chroma too. */ | |
| 2657 uint8_t *tmp_cb = s->obmc_scratchpad; | |
| 2658 uint8_t *tmp_cr = tmp_cb + 8*s->uvlinesize; | |
| 2659 uint8_t *tmp_y = tmp_cr + 8*s->uvlinesize; | |
| 2660 int refn0 = h->ref_cache[0][ scan8[n] ]; | |
| 2661 int refn1 = h->ref_cache[1][ scan8[n] ]; | |
| 2662 | |
| 2663 mc_dir_part(h, &h->ref_list[0][refn0], n, square, chroma_height, delta, 0, | |
| 2664 dest_y, dest_cb, dest_cr, | |
| 2665 x_offset, y_offset, qpix_put, chroma_put); | |
| 2666 mc_dir_part(h, &h->ref_list[1][refn1], n, square, chroma_height, delta, 1, | |
| 2667 tmp_y, tmp_cb, tmp_cr, | |
| 2668 x_offset, y_offset, qpix_put, chroma_put); | |
| 2669 | |
| 2670 if(h->use_weight == 2){ | |
| 2671 int weight0 = h->implicit_weight[refn0][refn1]; | |
| 2672 int weight1 = 64 - weight0; | |
| 2673 luma_weight_avg( dest_y, tmp_y, s-> linesize, 5, weight0, weight1, 0, 0); | |
| 2674 chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, 5, weight0, weight1, 0, 0); | |
| 2675 chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, 5, weight0, weight1, 0, 0); | |
| 2676 }else{ | |
| 2677 luma_weight_avg(dest_y, tmp_y, s->linesize, h->luma_log2_weight_denom, | |
| 2678 h->luma_weight[0][refn0], h->luma_weight[1][refn1], | |
| 2679 h->luma_offset[0][refn0], h->luma_offset[1][refn1]); | |
| 2680 chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, h->chroma_log2_weight_denom, | |
| 2681 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0], | |
| 2682 h->chroma_offset[0][refn0][0], h->chroma_offset[1][refn1][0]); | |
| 2683 chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, h->chroma_log2_weight_denom, | |
| 2684 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1], | |
| 2685 h->chroma_offset[0][refn0][1], h->chroma_offset[1][refn1][1]); | |
| 2686 } | |
| 2687 }else{ | |
| 2688 int list = list1 ? 1 : 0; | |
| 2689 int refn = h->ref_cache[list][ scan8[n] ]; | |
| 2690 Picture *ref= &h->ref_list[list][refn]; | |
| 2691 mc_dir_part(h, ref, n, square, chroma_height, delta, list, | |
| 2692 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2693 qpix_put, chroma_put); | |
| 2694 | |
| 2695 luma_weight_op(dest_y, s->linesize, h->luma_log2_weight_denom, | |
| 2696 h->luma_weight[list][refn], h->luma_offset[list][refn]); | |
| 2697 if(h->use_weight_chroma){ | |
| 2698 chroma_weight_op(dest_cb, s->uvlinesize, h->chroma_log2_weight_denom, | |
| 2699 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]); | |
| 2700 chroma_weight_op(dest_cr, s->uvlinesize, h->chroma_log2_weight_denom, | |
| 2701 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]); | |
| 2702 } | |
| 2703 } | |
| 2704 } | |
| 2705 | |
| 2706 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta, | |
| 2707 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2708 int x_offset, int y_offset, | |
| 2709 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2710 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
| 2711 h264_weight_func *weight_op, h264_biweight_func *weight_avg, | |
| 2712 int list0, int list1){ | |
| 2713 if((h->use_weight==2 && list0 && list1 | |
| 2714 && (h->implicit_weight[ h->ref_cache[0][scan8[n]] ][ h->ref_cache[1][scan8[n]] ] != 32)) | |
| 2715 || h->use_weight==1) | |
| 2716 mc_part_weighted(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
| 2717 x_offset, y_offset, qpix_put, chroma_put, | |
| 2718 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1); | |
| 2719 else | |
| 2720 mc_part_std(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
| 2721 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1); | |
| 2722 } | |
| 2723 | |
| 1168 | 2724 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
| 2725 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put), | |
| 2415 | 2726 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg), |
| 2727 h264_weight_func *weight_op, h264_biweight_func *weight_avg){ | |
| 1168 | 2728 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
|
2729 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 2730 const int mb_type= s->current_picture.mb_type[mb_xy]; |
| 2731 | |
| 2732 assert(IS_INTER(mb_type)); | |
| 2733 | |
| 2734 if(IS_16X16(mb_type)){ | |
| 2735 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2736 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0], | |
| 2415 | 2737 &weight_op[0], &weight_avg[0], |
| 1168 | 2738 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 2739 }else if(IS_16X8(mb_type)){ | |
| 2740 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2741 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
| 2415 | 2742 &weight_op[1], &weight_avg[1], |
| 1168 | 2743 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 2744 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4, | |
| 2745 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
| 2415 | 2746 &weight_op[1], &weight_avg[1], |
| 1168 | 2747 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
| 2748 }else if(IS_8X16(mb_type)){ | |
| 2749 mc_part(h, 0, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2750 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
| 2415 | 2751 &weight_op[2], &weight_avg[2], |
| 1168 | 2752 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 2753 mc_part(h, 4, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 4, 0, | |
| 2754 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
| 2415 | 2755 &weight_op[2], &weight_avg[2], |
| 1168 | 2756 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1)); |
| 2757 }else{ | |
| 2758 int i; | |
| 2759 | |
| 2760 assert(IS_8X8(mb_type)); | |
| 2761 | |
| 2762 for(i=0; i<4; i++){ | |
| 2763 const int sub_mb_type= h->sub_mb_type[i]; | |
| 2764 const int n= 4*i; | |
| 2765 int x_offset= (i&1)<<2; | |
| 2766 int y_offset= (i&2)<<1; | |
| 2767 | |
| 2768 if(IS_SUB_8X8(sub_mb_type)){ | |
| 2769 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2770 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
| 2415 | 2771 &weight_op[3], &weight_avg[3], |
| 1168 | 2772 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2773 }else if(IS_SUB_8X4(sub_mb_type)){ | |
| 2774 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2775 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
| 2415 | 2776 &weight_op[4], &weight_avg[4], |
| 1168 | 2777 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2778 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2, | |
| 2779 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
| 2415 | 2780 &weight_op[4], &weight_avg[4], |
| 1168 | 2781 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2782 }else if(IS_SUB_4X8(sub_mb_type)){ | |
| 2783 mc_part(h, n , 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2784 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
| 2415 | 2785 &weight_op[5], &weight_avg[5], |
| 1168 | 2786 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2787 mc_part(h, n+1, 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset, | |
| 2788 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
| 2415 | 2789 &weight_op[5], &weight_avg[5], |
| 1168 | 2790 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2791 }else{ | |
| 2792 int j; | |
| 2793 assert(IS_SUB_4X4(sub_mb_type)); | |
| 2794 for(j=0; j<4; j++){ | |
| 2795 int sub_x_offset= x_offset + 2*(j&1); | |
| 2796 int sub_y_offset= y_offset + (j&2); | |
| 2797 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset, | |
| 2798 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
| 2415 | 2799 &weight_op[6], &weight_avg[6], |
| 1168 | 2800 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2801 } | |
| 2802 } | |
| 2803 } | |
| 2804 } | |
| 2805 } | |
| 2806 | |
| 2807 static void decode_init_vlc(H264Context *h){ | |
| 2808 static int done = 0; | |
| 2809 | |
| 2810 if (!done) { | |
| 2811 int i; | |
| 2812 done = 1; | |
| 2813 | |
| 2814 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5, | |
| 2815 &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
|
2816 &chroma_dc_coeff_token_bits[0], 1, 1, 1); |
| 1168 | 2817 |
| 2818 for(i=0; i<4; i++){ | |
| 2819 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17, | |
| 2820 &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
|
2821 &coeff_token_bits[i][0], 1, 1, 1); |
| 1168 | 2822 } |
| 2823 | |
| 2824 for(i=0; i<3; i++){ | |
| 2825 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4, | |
| 2826 &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
|
2827 &chroma_dc_total_zeros_bits[i][0], 1, 1, 1); |
| 1168 | 2828 } |
| 2829 for(i=0; i<15; i++){ | |
| 2830 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16, | |
| 2831 &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
|
2832 &total_zeros_bits[i][0], 1, 1, 1); |
| 1168 | 2833 } |
| 2834 | |
| 2835 for(i=0; i<6; i++){ | |
| 2836 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7, | |
| 2837 &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
|
2838 &run_bits[i][0], 1, 1, 1); |
| 1168 | 2839 } |
| 2840 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16, | |
| 2841 &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
|
2842 &run_bits[6][0], 1, 1, 1); |
| 1168 | 2843 } |
| 2844 } | |
| 2845 | |
| 2846 /** | |
| 2847 * Sets the intra prediction function pointers. | |
| 2848 */ | |
| 2849 static void init_pred_ptrs(H264Context *h){ | |
| 2850 // MpegEncContext * const s = &h->s; | |
| 2851 | |
| 2852 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; | |
| 2853 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; | |
| 2854 h->pred4x4[DC_PRED ]= pred4x4_dc_c; | |
| 2855 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c; | |
| 2856 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c; | |
| 2857 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c; | |
| 2858 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c; | |
| 2859 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c; | |
| 2860 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c; | |
| 2861 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c; | |
| 2862 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c; | |
| 2863 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; | |
| 2864 | |
| 2755 | 2865 h->pred8x8l[VERT_PRED ]= pred8x8l_vertical_c; |
| 2866 h->pred8x8l[HOR_PRED ]= pred8x8l_horizontal_c; | |
| 2867 h->pred8x8l[DC_PRED ]= pred8x8l_dc_c; | |
| 2868 h->pred8x8l[DIAG_DOWN_LEFT_PRED ]= pred8x8l_down_left_c; | |
| 2869 h->pred8x8l[DIAG_DOWN_RIGHT_PRED]= pred8x8l_down_right_c; | |
| 2870 h->pred8x8l[VERT_RIGHT_PRED ]= pred8x8l_vertical_right_c; | |
| 2871 h->pred8x8l[HOR_DOWN_PRED ]= pred8x8l_horizontal_down_c; | |
| 2872 h->pred8x8l[VERT_LEFT_PRED ]= pred8x8l_vertical_left_c; | |
| 2873 h->pred8x8l[HOR_UP_PRED ]= pred8x8l_horizontal_up_c; | |
| 2874 h->pred8x8l[LEFT_DC_PRED ]= pred8x8l_left_dc_c; | |
| 2875 h->pred8x8l[TOP_DC_PRED ]= pred8x8l_top_dc_c; | |
| 2876 h->pred8x8l[DC_128_PRED ]= pred8x8l_128_dc_c; | |
| 2877 | |
| 1168 | 2878 h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c; |
| 2879 h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c; | |
| 2880 h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c; | |
| 2881 h->pred8x8[PLANE_PRED8x8 ]= pred8x8_plane_c; | |
| 2882 h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c; | |
| 2883 h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c; | |
| 2884 h->pred8x8[DC_128_PRED8x8 ]= pred8x8_128_dc_c; | |
| 2885 | |
| 2886 h->pred16x16[DC_PRED8x8 ]= pred16x16_dc_c; | |
| 2887 h->pred16x16[VERT_PRED8x8 ]= pred16x16_vertical_c; | |
| 2888 h->pred16x16[HOR_PRED8x8 ]= pred16x16_horizontal_c; | |
| 2889 h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c; | |
| 2890 h->pred16x16[LEFT_DC_PRED8x8]= pred16x16_left_dc_c; | |
| 2891 h->pred16x16[TOP_DC_PRED8x8 ]= pred16x16_top_dc_c; | |
| 2892 h->pred16x16[DC_128_PRED8x8 ]= pred16x16_128_dc_c; | |
| 2893 } | |
| 2894 | |
| 2895 static void free_tables(H264Context *h){ | |
| 2896 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
|
2897 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
|
2898 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
|
2899 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
|
2900 av_freep(&h->mvd_table[1]); |
| 2396 | 2901 av_freep(&h->direct_table); |
| 1168 | 2902 av_freep(&h->non_zero_count); |
| 2903 av_freep(&h->slice_table_base); | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2904 av_freep(&h->top_borders[1]); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2905 av_freep(&h->top_borders[0]); |
| 1168 | 2906 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
|
2907 |
| 1168 | 2908 av_freep(&h->mb2b_xy); |
| 2909 av_freep(&h->mb2b8_xy); | |
| 2415 | 2910 |
| 2763 | 2911 av_freep(&h->dequant4_coeff); |
| 2755 | 2912 av_freep(&h->dequant8_coeff); |
| 2913 | |
| 2415 | 2914 av_freep(&h->s.obmc_scratchpad); |
| 1168 | 2915 } |
| 2916 | |
| 2917 /** | |
| 2918 * allocates tables. | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
2919 * needs width/height |
| 1168 | 2920 */ |
| 2921 static int alloc_tables(H264Context *h){ | |
| 2922 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
|
2923 const int big_mb_num= s->mb_stride * (s->mb_height+1); |
| 2755 | 2924 int x,y,q; |
| 1168 | 2925 |
| 2926 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
|
2927 |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2928 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t)) |
| 1168 | 2929 CHECKED_ALLOCZ(h->slice_table_base , big_mb_num * sizeof(uint8_t)) |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2930 CHECKED_ALLOCZ(h->top_borders[0] , s->mb_width * (16+8+8) * sizeof(uint8_t)) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2931 CHECKED_ALLOCZ(h->top_borders[1] , s->mb_width * (16+8+8) * sizeof(uint8_t)) |
| 2336 | 2932 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t)) |
| 1168 | 2933 |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2934 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
|
2935 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
|
2936 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
|
2937 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t)); |
| 2396 | 2938 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
|
2939 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2940 |
| 1168 | 2941 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
|
2942 h->slice_table= h->slice_table_base + s->mb_stride + 1; |
| 1168 | 2943 |
|
2641
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
2944 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint32_t)); |
|
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
2945 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint32_t)); |
| 1168 | 2946 for(y=0; y<s->mb_height; y++){ |
| 2947 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
|
2948 const int mb_xy= x + y*s->mb_stride; |
| 1168 | 2949 const int b_xy = 4*x + 4*y*h->b_stride; |
| 2950 const int b8_xy= 2*x + 2*y*h->b8_stride; | |
| 2951 | |
| 2952 h->mb2b_xy [mb_xy]= b_xy; | |
| 2953 h->mb2b8_xy[mb_xy]= b8_xy; | |
| 2954 } | |
| 2955 } | |
| 2415 | 2956 |
| 2763 | 2957 CHECKED_ALLOCZ(h->dequant4_coeff, 52*16 * sizeof(uint16_t)); |
| 2755 | 2958 CHECKED_ALLOCZ(h->dequant8_coeff, 52*64 * sizeof(uint16_t)); |
| 2763 | 2959 memcpy(h->dequant4_coeff, dequant_coeff, 52*16 * sizeof(uint16_t)); |
| 2755 | 2960 for(q=0; q<52; q++){ |
| 2961 int shift = div6[q]; | |
| 2962 int idx = rem6[q]; | |
| 2963 if(shift >= 2) // qp<12 are shifted during dequant | |
| 2964 shift -= 2; | |
| 2965 for(x=0; x<64; x++) | |
| 2966 h->dequant8_coeff[q][x] = dequant8_coeff_init[idx][ | |
|
2781
899a2ea0907c
parenthesing to avoid compiler errors in the future - compared asm outputs, behaviour didnt changed
alex
parents:
2774
diff
changeset
|
2967 dequant8_coeff_init_scan[((x>>1)&12) | (x&3)] ] << shift; |
| 2755 | 2968 } |
| 2763 | 2969 if(h->sps.transform_bypass){ |
| 2970 for(x=0; x<16; x++) | |
| 2971 h->dequant4_coeff[0][x] = 1; | |
| 2972 for(x=0; x<64; x++) | |
| 2973 h->dequant8_coeff[0][x] = 1<<2; | |
| 2974 } | |
| 2755 | 2975 |
| 2417 | 2976 s->obmc_scratchpad = NULL; |
| 2977 | |
| 1168 | 2978 return 0; |
| 2979 fail: | |
| 2980 free_tables(h); | |
| 2981 return -1; | |
| 2982 } | |
| 2983 | |
| 2984 static void common_init(H264Context *h){ | |
| 2985 MpegEncContext * const s = &h->s; | |
| 2986 | |
| 2987 s->width = s->avctx->width; | |
| 2988 s->height = s->avctx->height; | |
| 2989 s->codec_id= s->avctx->codec->id; | |
| 2990 | |
| 2991 init_pred_ptrs(h); | |
| 2992 | |
| 1698 | 2993 s->unrestricted_mv=1; |
| 1168 | 2994 s->decode=1; //FIXME |
| 2995 } | |
| 2996 | |
| 2997 static int decode_init(AVCodecContext *avctx){ | |
| 2998 H264Context *h= avctx->priv_data; | |
| 2999 MpegEncContext * const s = &h->s; | |
| 3000 | |
| 1892 | 3001 MPV_decode_defaults(s); |
| 3002 | |
| 1168 | 3003 s->avctx = avctx; |
| 3004 common_init(h); | |
| 3005 | |
| 3006 s->out_format = FMT_H264; | |
| 3007 s->workaround_bugs= avctx->workaround_bugs; | |
| 3008 | |
| 3009 // set defaults | |
| 3010 // s->decode_mb= ff_h263_decode_mb; | |
| 3011 s->low_delay= 1; | |
| 3012 avctx->pix_fmt= PIX_FMT_YUV420P; | |
| 3013 | |
| 3014 decode_init_vlc(h); | |
| 3015 | |
|
2547
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
3016 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
|
3017 *(char *)avctx->extradata == 1){ |
| 2227 | 3018 h->is_avc = 1; |
| 3019 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
|
3020 } else { |
|
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
3021 h->is_avc = 0; |
| 2227 | 3022 } |
| 3023 | |
| 1168 | 3024 return 0; |
| 3025 } | |
| 3026 | |
| 3027 static void frame_start(H264Context *h){ | |
| 3028 MpegEncContext * const s = &h->s; | |
| 3029 int i; | |
| 3030 | |
| 3031 MPV_frame_start(s, s->avctx); | |
| 3032 ff_er_frame_start(s); | |
| 3033 | |
| 3034 assert(s->linesize && s->uvlinesize); | |
| 3035 | |
| 3036 for(i=0; i<16; i++){ | |
| 3037 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
|
3038 h->block_offset[24+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->linesize*((scan8[i] - scan8[0])>>3); |
| 1168 | 3039 } |
| 3040 for(i=0; i<4; i++){ | |
| 3041 h->block_offset[16+i]= | |
| 3042 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
|
3043 h->block_offset[24+16+i]= |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3044 h->block_offset[24+20+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->uvlinesize*((scan8[i] - scan8[0])>>3); |
| 1168 | 3045 } |
| 3046 | |
|
2416
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
3047 /* 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
|
3048 * 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
|
3049 if(!s->obmc_scratchpad) |
|
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
3050 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
|
3051 |
| 1168 | 3052 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; |
| 3053 } | |
| 3054 | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3055 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
|
3056 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
|
3057 int i; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3058 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3059 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
|
3060 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
|
3061 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
|
3062 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3063 // There are two lines saved, the line above the the top macroblock of a pair, |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3064 // and the line above the bottom macroblock |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3065 h->left_border[0]= h->top_borders[0][s->mb_x][15]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3066 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
|
3067 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
|
3068 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3069 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3070 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 16*linesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3071 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize); |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3072 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3073 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3074 h->left_border[17 ]= h->top_borders[0][s->mb_x][16+7]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3075 h->left_border[17+9]= h->top_borders[0][s->mb_x][24+7]; |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3076 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
|
3077 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
|
3078 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
|
3079 } |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3080 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+8*uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3081 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+8*uvlinesize); |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3082 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3083 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3084 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3085 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
|
3086 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
|
3087 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
|
3088 uint64_t temp64; |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3089 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
|
3090 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
|
3091 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3092 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
|
3093 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
|
3094 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
|
3095 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3096 #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
|
3097 t= a;\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3098 if(xchg)\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3099 a= b;\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3100 b= t; |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3101 |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3102 if(deblock_left){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3103 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
|
3104 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
|
3105 } |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3106 } |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3107 |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3108 if(deblock_top){ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3109 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3110 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); |
| 2755 | 3111 if(s->mb_x < s->mb_width){ |
| 3112 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1); | |
| 3113 } | |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3114 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3115 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3116 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
|
3117 if(deblock_left){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3118 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
|
3119 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
|
3120 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
|
3121 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3122 } |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3123 if(deblock_top){ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3124 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3125 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3126 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3127 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3128 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3129 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3130 static inline void backup_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3131 MpegEncContext * const s = &h->s; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3132 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3133 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3134 src_y -= 2 * linesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3135 src_cb -= 2 * uvlinesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3136 src_cr -= 2 * uvlinesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3137 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3138 // There are two lines saved, the line above the the top macroblock of a pair, |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3139 // and the line above the bottom macroblock |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3140 h->left_border[0]= h->top_borders[0][s->mb_x][15]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3141 h->left_border[1]= h->top_borders[1][s->mb_x][15]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3142 for(i=2; i<34; i++){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3143 h->left_border[i]= src_y[15+i* linesize]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3144 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3145 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3146 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 32*linesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3147 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+32*linesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3148 *(uint64_t*)(h->top_borders[1][s->mb_x]+0)= *(uint64_t*)(src_y + 33*linesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3149 *(uint64_t*)(h->top_borders[1][s->mb_x]+8)= *(uint64_t*)(src_y +8+33*linesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3150 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3151 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3152 h->left_border[34 ]= h->top_borders[0][s->mb_x][16+7]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3153 h->left_border[34+ 1]= h->top_borders[1][s->mb_x][16+7]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3154 h->left_border[34+18 ]= h->top_borders[0][s->mb_x][24+7]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3155 h->left_border[34+18+1]= h->top_borders[1][s->mb_x][24+7]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3156 for(i=2; i<18; i++){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3157 h->left_border[i+34 ]= src_cb[7+i*uvlinesize]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3158 h->left_border[i+34+18]= src_cr[7+i*uvlinesize]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3159 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3160 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+16*uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3161 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+16*uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3162 *(uint64_t*)(h->top_borders[1][s->mb_x]+16)= *(uint64_t*)(src_cb+17*uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3163 *(uint64_t*)(h->top_borders[1][s->mb_x]+24)= *(uint64_t*)(src_cr+17*uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3164 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3165 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3166 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3167 static inline void xchg_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3168 MpegEncContext * const s = &h->s; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3169 int temp8, i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3170 uint64_t temp64; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3171 int deblock_left = (s->mb_x > 0); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3172 int deblock_top = (s->mb_y > 0); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3173 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3174 tprintf("xchg_pair_border: src_y:%p src_cb:%p src_cr:%p ls:%d uvls:%d\n", src_y, src_cb, src_cr, linesize, uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3175 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3176 src_y -= 2 * linesize + 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3177 src_cb -= 2 * uvlinesize + 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3178 src_cr -= 2 * uvlinesize + 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3179 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3180 #define XCHG(a,b,t,xchg)\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3181 t= a;\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3182 if(xchg)\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3183 a= b;\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3184 b= t; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3185 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3186 if(deblock_left){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3187 for(i = (!deblock_top)<<1; i<34; i++){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3188 XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3189 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3190 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3191 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3192 if(deblock_top){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3193 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3194 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3195 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+0), *(uint64_t*)(src_y +1 +linesize), temp64, xchg); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3196 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+8), *(uint64_t*)(src_y +9 +linesize), temp64, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3197 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3198 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3199 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3200 if(deblock_left){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3201 for(i = (!deblock_top) << 1; i<18; i++){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3202 XCHG(h->left_border[i+34 ], src_cb[i*uvlinesize], temp8, xchg); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3203 XCHG(h->left_border[i+34+18], src_cr[i*uvlinesize], temp8, xchg); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3204 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3205 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3206 if(deblock_top){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3207 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3208 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3209 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+16), *(uint64_t*)(src_cb+1 +uvlinesize), temp64, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3210 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+24), *(uint64_t*)(src_cr+1 +uvlinesize), temp64, 1); |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3211 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3212 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3213 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3214 |
| 1168 | 3215 static void hl_decode_mb(H264Context *h){ |
| 3216 MpegEncContext * const s = &h->s; | |
| 3217 const int mb_x= s->mb_x; | |
| 3218 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
|
3219 const int mb_xy= mb_x + mb_y*s->mb_stride; |
| 1168 | 3220 const int mb_type= s->current_picture.mb_type[mb_xy]; |
| 3221 uint8_t *dest_y, *dest_cb, *dest_cr; | |
| 3222 int linesize, uvlinesize /*dct_offset*/; | |
| 3223 int i; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3224 int *block_offset = &h->block_offset[0]; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3225 const unsigned int bottom = mb_y & 1; |
| 2763 | 3226 const int transform_bypass = (s->qscale == 0 && h->sps.transform_bypass); |
| 3227 void (*idct_add)(uint8_t *dst, DCTELEM *block, int stride); | |
| 1168 | 3228 |
| 3229 if(!s->decode) | |
| 3230 return; | |
| 3231 | |
| 3232 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; | |
| 3233 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 3234 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 3235 | |
| 3236 if (h->mb_field_decoding_flag) { | |
| 3237 linesize = s->linesize * 2; | |
| 3238 uvlinesize = s->uvlinesize * 2; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3239 block_offset = &h->block_offset[24]; |
| 1168 | 3240 if(mb_y&1){ //FIXME move out of this func? |
| 3241 dest_y -= s->linesize*15; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3242 dest_cb-= s->uvlinesize*7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3243 dest_cr-= s->uvlinesize*7; |
| 1168 | 3244 } |
| 3245 } else { | |
| 3246 linesize = s->linesize; | |
| 3247 uvlinesize = s->uvlinesize; | |
| 3248 // dct_offset = s->linesize * 16; | |
| 3249 } | |
| 2763 | 3250 |
| 3251 idct_add = transform_bypass | |
| 3252 ? IS_8x8DCT(mb_type) ? s->dsp.add_pixels8 : s->dsp.add_pixels4 | |
| 3253 : IS_8x8DCT(mb_type) ? s->dsp.h264_idct8_add : s->dsp.h264_idct_add; | |
| 1168 | 3254 |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3255 if (IS_INTRA_PCM(mb_type)) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3256 unsigned int x, y; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3257 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3258 // 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
|
3259 // 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
|
3260 for(i=0; i<16; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3261 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3262 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
|
3263 *(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
|
3264 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3265 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3266 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3267 for(i=16; i<16+4; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3268 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3269 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
|
3270 *(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
|
3271 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3272 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3273 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3274 for(i=20; i<20+4; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3275 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3276 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
|
3277 *(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
|
3278 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3279 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3280 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3281 } else { |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3282 if(IS_INTRA(mb_type)){ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3283 if(h->deblocking_filter) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3284 if (h->mb_aff_frame) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3285 if (!bottom) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3286 xchg_pair_border(h, dest_y, dest_cb, dest_cr, s->linesize, s->uvlinesize, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3287 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3288 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3289 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3290 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3291 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3292 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
|
3293 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
|
3294 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
|
3295 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3296 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3297 if(IS_INTRA4x4(mb_type)){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3298 if(!s->encoding){ |
| 2755 | 3299 if(IS_8x8DCT(mb_type)){ |
| 3300 for(i=0; i<16; i+=4){ | |
| 3301 uint8_t * const ptr= dest_y + block_offset[i]; | |
| 3302 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ]; | |
| 3303 h->pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000, | |
| 3304 (h->topright_samples_available<<(i+1))&0x8000, linesize); | |
| 3305 if(h->non_zero_count_cache[ scan8[i] ]) | |
| 2763 | 3306 idct_add(ptr, h->mb + i*16, linesize); |
| 2755 | 3307 } |
| 3308 }else | |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3309 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
|
3310 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
|
3311 uint8_t *topright; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3312 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
|
3313 int tr; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3314 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3315 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
|
3316 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
|
3317 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
|
3318 if(!topright_avail){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3319 tr= ptr[3 - linesize]*0x01010101; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3320 topright= (uint8_t*) &tr; |
| 2755 | 3321 }else |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3322 topright= ptr + 4 - linesize; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3323 }else |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3324 topright= NULL; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3325 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3326 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
|
3327 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
|
3328 if(s->codec_id == CODEC_ID_H264) |
| 2763 | 3329 idct_add(ptr, h->mb + i*16, linesize); |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3330 else |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3331 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
|
3332 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3333 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3334 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3335 }else{ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3336 h->pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize); |
| 2763 | 3337 if(s->codec_id == CODEC_ID_H264){ |
| 3338 if(!transform_bypass) | |
| 3339 h264_luma_dc_dequant_idct_c(h->mb, s->qscale); | |
| 3340 }else | |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3341 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
|
3342 } |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3343 if(h->deblocking_filter) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3344 if (h->mb_aff_frame) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3345 if (bottom) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3346 uint8_t *pair_dest_y = s->current_picture.data[0] + ((mb_y-1) * 16* s->linesize ) + mb_x * 16; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3347 uint8_t *pair_dest_cb = s->current_picture.data[1] + ((mb_y-1) * 8 * s->uvlinesize) + mb_x * 8; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3348 uint8_t *pair_dest_cr = s->current_picture.data[2] + ((mb_y-1) * 8 * s->uvlinesize) + mb_x * 8; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3349 s->mb_y--; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3350 xchg_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize, 0); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3351 s->mb_y++; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3352 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3353 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3354 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3355 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3356 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3357 }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
|
3358 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
|
3359 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
|
3360 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
|
3361 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
|
3362 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3363 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3364 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3365 if(!IS_INTRA4x4(mb_type)){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3366 if(s->codec_id == CODEC_ID_H264){ |
| 2755 | 3367 const int di = IS_8x8DCT(mb_type) ? 4 : 1; |
| 3368 for(i=0; i<16; i+=di){ | |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3369 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
|
3370 uint8_t * const ptr= dest_y + block_offset[i]; |
| 2763 | 3371 idct_add(ptr, h->mb + i*16, linesize); |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3372 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3373 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3374 }else{ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3375 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
|
3376 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
|
3377 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
|
3378 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); |
| 1234 | 3379 } |
| 1168 | 3380 } |
| 3381 } | |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3382 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3383 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3384 if(!(s->flags&CODEC_FLAG_GRAY)){ |
| 2763 | 3385 idct_add = transform_bypass ? s->dsp.add_pixels4 : s->dsp.h264_idct_add; |
| 3386 if(!transform_bypass){ | |
| 3387 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp); | |
| 3388 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp); | |
| 3389 } | |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3390 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
|
3391 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
|
3392 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
|
3393 uint8_t * const ptr= dest_cb + block_offset[i]; |
| 2763 | 3394 idct_add(ptr, h->mb + i*16, uvlinesize); |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3395 } |
| 1250 | 3396 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3397 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
|
3398 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
|
3399 uint8_t * const ptr= dest_cr + block_offset[i]; |
| 2763 | 3400 idct_add(ptr, h->mb + i*16, uvlinesize); |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3401 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3402 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3403 }else{ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3404 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
|
3405 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
|
3406 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
|
3407 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
|
3408 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3409 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3410 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
|
3411 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
|
3412 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
|
3413 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
|
3414 } |
| 1250 | 3415 } |
| 1168 | 3416 } |
| 3417 } | |
| 3418 } | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3419 if(h->deblocking_filter) { |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3420 if (h->mb_aff_frame) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3421 const int mb_y = s->mb_y - 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3422 uint8_t *pair_dest_y, *pair_dest_cb, *pair_dest_cr; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3423 const int mb_xy= mb_x + mb_y*s->mb_stride; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3424 const int mb_type_top = s->current_picture.mb_type[mb_xy]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3425 const int mb_type_bottom= s->current_picture.mb_type[mb_xy+s->mb_stride]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3426 uint8_t tmp = s->current_picture.data[1][384]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3427 if (!bottom) return; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3428 pair_dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3429 pair_dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3430 pair_dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3431 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3432 backup_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3433 // TODO deblock a pair |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3434 // top |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3435 s->mb_y--; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3436 tprintf("call mbaff filter_mb mb_x:%d mb_y:%d pair_dest_y = %p, dest_y = %p\n", mb_x, mb_y, pair_dest_y, dest_y); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3437 fill_caches(h, mb_type_top, 1); //FIXME don't fill stuff which isn't used by filter_mb |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3438 filter_mb(h, mb_x, mb_y, pair_dest_y, pair_dest_cb, pair_dest_cr, linesize, uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3439 if (tmp != s->current_picture.data[1][384]) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3440 tprintf("modified pixel 8,1 (1)\n"); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3441 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3442 // bottom |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3443 s->mb_y++; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3444 tprintf("call mbaff filter_mb\n"); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3445 fill_caches(h, mb_type_bottom, 1); //FIXME don't fill stuff which isn't used by filter_mb |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3446 filter_mb(h, mb_x, mb_y+1, dest_y, dest_cb, dest_cr, linesize, uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3447 if (tmp != s->current_picture.data[1][384]) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3448 tprintf("modified pixel 8,1 (2)\n"); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3449 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3450 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3451 tprintf("call filter_mb\n"); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3452 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3453 fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3454 filter_mb(h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3455 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3456 } |
| 1168 | 3457 } |
| 3458 | |
| 3459 /** | |
| 3460 * fills the default_ref_list. | |
| 3461 */ | |
| 3462 static int fill_default_ref_list(H264Context *h){ | |
| 3463 MpegEncContext * const s = &h->s; | |
| 3464 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
|
3465 int smallest_poc_greater_than_current = -1; |
| 2582 | 3466 Picture sorted_short_ref[32]; |
| 1168 | 3467 |
| 3468 if(h->slice_type==B_TYPE){ | |
| 3469 int out_i; | |
| 2713 | 3470 int limit= INT_MIN; |
| 1168 | 3471 |
|
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
|
3472 /* sort frame according to poc in B slice */ |
| 1168 | 3473 for(out_i=0; out_i<h->short_ref_count; out_i++){ |
| 2713 | 3474 int best_i=INT_MIN; |
|
2255
507690ff49a2
assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2254
diff
changeset
|
3475 int best_poc=INT_MAX; |
| 1168 | 3476 |
| 3477 for(i=0; i<h->short_ref_count; i++){ | |
| 3478 const int poc= h->short_ref[i]->poc; | |
| 3479 if(poc > limit && poc < best_poc){ | |
| 3480 best_poc= poc; | |
| 3481 best_i= i; | |
| 3482 } | |
| 3483 } | |
| 3484 | |
| 2713 | 3485 assert(best_i != INT_MIN); |
| 1168 | 3486 |
| 3487 limit= best_poc; | |
| 3488 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
|
3489 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
|
3490 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
|
3491 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
|
3492 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
|
3493 } |
|
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
|
3494 } |
| 1168 | 3495 } |
| 3496 } | |
| 3497 | |
| 3498 if(s->picture_structure == PICT_FRAME){ | |
| 3499 if(h->slice_type==B_TYPE){ | |
| 3500 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
|
3501 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
|
3502 |
|
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
|
3503 // find the largest poc |
| 1168 | 3504 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
|
3505 int index = 0; |
| 2447 | 3506 int j= -99; |
| 3507 int step= list ? -1 : 1; | |
| 3508 | |
| 3509 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++, j+=step) { | |
| 3510 while(j<0 || j>= h->short_ref_count){ | |
|
2680
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3511 if(j != -99 && step == (list ? -1 : 1)) |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3512 return -1; |
| 2447 | 3513 step = -step; |
| 3514 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
|
3515 } |
| 2447 | 3516 if(sorted_short_ref[j].reference != 3) continue; |
| 3517 h->default_ref_list[list][index ]= sorted_short_ref[j]; | |
| 3518 h->default_ref_list[list][index++].pic_id= sorted_short_ref[j].frame_num; | |
| 1168 | 3519 } |
| 3520 | |
|
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
|
3521 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
|
3522 if(h->long_ref[i] == NULL) continue; |
| 1168 | 3523 if(h->long_ref[i]->reference != 3) continue; |
| 3524 | |
| 3525 h->default_ref_list[ list ][index ]= *h->long_ref[i]; | |
| 3526 h->default_ref_list[ list ][index++].pic_id= i;; | |
| 3527 } | |
| 3528 | |
| 2447 | 3529 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
|
3530 // 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
|
3531 // L0 and L1 are identical |
| 1168 | 3532 Picture temp= h->default_ref_list[1][0]; |
| 3533 h->default_ref_list[1][0] = h->default_ref_list[1][1]; | |
| 2673 | 3534 h->default_ref_list[1][1] = temp; |
| 1168 | 3535 } |
| 3536 | |
| 3537 if(index < h->ref_count[ list ]) | |
| 3538 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index)); | |
| 3539 } | |
| 3540 }else{ | |
| 3541 int index=0; | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3542 for(i=0; i<h->short_ref_count; i++){ |
| 1168 | 3543 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit |
| 3544 h->default_ref_list[0][index ]= *h->short_ref[i]; | |
| 3545 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num; | |
| 3546 } | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3547 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
|
3548 if(h->long_ref[i] == NULL) continue; |
| 1168 | 3549 if(h->long_ref[i]->reference != 3) continue; |
| 3550 h->default_ref_list[0][index ]= *h->long_ref[i]; | |
| 3551 h->default_ref_list[0][index++].pic_id= i;; | |
| 3552 } | |
| 3553 if(index < h->ref_count[0]) | |
| 3554 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index)); | |
| 3555 } | |
| 3556 }else{ //FIELD | |
| 3557 if(h->slice_type==B_TYPE){ | |
| 3558 }else{ | |
| 3559 //FIXME second field balh | |
| 3560 } | |
| 3561 } | |
|
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
|
3562 #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
|
3563 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
|
3564 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
|
3565 } |
|
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
|
3566 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
|
3567 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
|
3568 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
|
3569 } |
|
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
|
3570 } |
|
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
|
3571 #endif |
| 1168 | 3572 return 0; |
| 3573 } | |
| 3574 | |
|
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
|
3575 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
|
3576 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
|
3577 |
| 1168 | 3578 static int decode_ref_pic_list_reordering(H264Context *h){ |
| 3579 MpegEncContext * const s = &h->s; | |
|
2680
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3580 int list, index; |
| 1168 | 3581 |
|
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
|
3582 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
|
3583 print_long_term(h); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3584 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move before func |
| 1168 | 3585 |
| 3586 for(list=0; list<2; list++){ | |
| 3587 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]); | |
| 3588 | |
| 3589 if(get_bits1(&s->gb)){ | |
| 3590 int pred= h->curr_pic_num; | |
| 3591 | |
| 3592 for(index=0; ; index++){ | |
| 3593 int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb); | |
| 3594 int pic_id; | |
| 3595 int i; | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3596 Picture *ref = NULL; |
| 1168 | 3597 |
|
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3598 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
|
3599 break; |
| 1168 | 3600 |
| 3601 if(index >= h->ref_count[list]){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3602 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n"); |
| 1168 | 3603 return -1; |
| 3604 } | |
| 3605 | |
| 3606 if(reordering_of_pic_nums_idc<3){ | |
| 3607 if(reordering_of_pic_nums_idc<2){ | |
| 3608 const int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1; | |
| 3609 | |
| 3610 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
|
3611 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n"); |
| 1168 | 3612 return -1; |
| 3613 } | |
| 3614 | |
| 3615 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num; | |
| 3616 else pred+= abs_diff_pic_num; | |
| 3617 pred &= h->max_pic_num - 1; | |
| 3618 | |
| 2683 | 3619 for(i= h->short_ref_count-1; i>=0; i--){ |
| 3620 ref = h->short_ref[i]; | |
| 3621 assert(ref->reference == 3); | |
| 3622 assert(!ref->long_ref); | |
| 3623 if(ref->data[0] != NULL && ref->frame_num == pred && ref->long_ref == 0) // ignore non existing pictures by testing data[0] pointer | |
| 1168 | 3624 break; |
| 3625 } | |
| 2683 | 3626 if(i>=0) |
| 3627 ref->pic_id= ref->frame_num; | |
| 1168 | 3628 }else{ |
| 3629 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx | |
| 2683 | 3630 ref = h->long_ref[pic_id]; |
| 3631 ref->pic_id= pic_id; | |
| 3632 assert(ref->reference == 3); | |
| 3633 assert(ref->long_ref); | |
| 3634 i=0; | |
| 1168 | 3635 } |
| 3636 | |
|
2485
2844b8cf4e11
H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents:
2484
diff
changeset
|
3637 if (i < 0) { |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3638 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n"); |
| 1168 | 3639 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME |
| 2683 | 3640 } else { |
| 3641 for(i=index; i+1<h->ref_count[list]; i++){ | |
| 3642 if(ref->long_ref == h->ref_list[list][i].long_ref && ref->pic_id == h->ref_list[list][i].pic_id) | |
| 3643 break; | |
|
2650
d321fbf0b2ce
reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents:
2649
diff
changeset
|
3644 } |
|
d321fbf0b2ce
reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents:
2649
diff
changeset
|
3645 for(; i > index; i--){ |
|
d321fbf0b2ce
reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents:
2649
diff
changeset
|
3646 h->ref_list[list][i]= h->ref_list[list][i-1]; |
|
d321fbf0b2ce
reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents:
2649
diff
changeset
|
3647 } |
| 2683 | 3648 h->ref_list[list][index]= *ref; |
| 1168 | 3649 } |
|
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3650 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3651 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n"); |
| 1168 | 3652 return -1; |
| 3653 } | |
| 3654 } | |
| 3655 } | |
| 3656 | |
| 3657 if(h->slice_type!=B_TYPE) break; | |
| 3658 } | |
|
2680
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3659 for(list=0; list<2; list++){ |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3660 for(index= 0; index < h->ref_count[list]; index++){ |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3661 if(!h->ref_list[list][index].data[0]) |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3662 h->ref_list[list][index]= s->current_picture; |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3663 } |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3664 if(h->slice_type!=B_TYPE) break; |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3665 } |
| 2396 | 3666 |
| 3667 if(h->slice_type==B_TYPE && !h->direct_spatial_mv_pred) | |
| 3668 direct_dist_scale_factor(h); | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3669 direct_ref_list_init(h); |
| 1168 | 3670 return 0; |
| 3671 } | |
| 3672 | |
| 3673 static int pred_weight_table(H264Context *h){ | |
| 3674 MpegEncContext * const s = &h->s; | |
| 3675 int list, i; | |
| 2415 | 3676 int luma_def, chroma_def; |
| 1168 | 3677 |
| 2415 | 3678 h->use_weight= 0; |
| 3679 h->use_weight_chroma= 0; | |
| 1168 | 3680 h->luma_log2_weight_denom= get_ue_golomb(&s->gb); |
| 3681 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb); | |
| 2415 | 3682 luma_def = 1<<h->luma_log2_weight_denom; |
| 3683 chroma_def = 1<<h->chroma_log2_weight_denom; | |
| 1168 | 3684 |
| 3685 for(list=0; list<2; list++){ | |
| 3686 for(i=0; i<h->ref_count[list]; i++){ | |
| 3687 int luma_weight_flag, chroma_weight_flag; | |
| 3688 | |
| 3689 luma_weight_flag= get_bits1(&s->gb); | |
| 3690 if(luma_weight_flag){ | |
| 3691 h->luma_weight[list][i]= get_se_golomb(&s->gb); | |
| 3692 h->luma_offset[list][i]= get_se_golomb(&s->gb); | |
| 2415 | 3693 if( h->luma_weight[list][i] != luma_def |
| 3694 || h->luma_offset[list][i] != 0) | |
| 3695 h->use_weight= 1; | |
| 3696 }else{ | |
| 3697 h->luma_weight[list][i]= luma_def; | |
| 3698 h->luma_offset[list][i]= 0; | |
| 1168 | 3699 } |
| 3700 | |
| 3701 chroma_weight_flag= get_bits1(&s->gb); | |
| 3702 if(chroma_weight_flag){ | |
| 3703 int j; | |
| 3704 for(j=0; j<2; j++){ | |
| 3705 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb); | |
| 3706 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb); | |
| 2415 | 3707 if( h->chroma_weight[list][i][j] != chroma_def |
| 3708 || h->chroma_offset[list][i][j] != 0) | |
| 3709 h->use_weight_chroma= 1; | |
| 3710 } | |
| 3711 }else{ | |
| 3712 int j; | |
| 3713 for(j=0; j<2; j++){ | |
| 3714 h->chroma_weight[list][i][j]= chroma_def; | |
| 3715 h->chroma_offset[list][i][j]= 0; | |
| 1168 | 3716 } |
| 3717 } | |
| 3718 } | |
| 3719 if(h->slice_type != B_TYPE) break; | |
| 3720 } | |
| 2415 | 3721 h->use_weight= h->use_weight || h->use_weight_chroma; |
| 1168 | 3722 return 0; |
| 3723 } | |
| 3724 | |
| 2415 | 3725 static void implicit_weight_table(H264Context *h){ |
| 3726 MpegEncContext * const s = &h->s; | |
| 3727 int ref0, ref1; | |
| 3728 int cur_poc = s->current_picture_ptr->poc; | |
| 3729 | |
| 3730 if( h->ref_count[0] == 1 && h->ref_count[1] == 1 | |
| 3731 && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){ | |
| 3732 h->use_weight= 0; | |
| 3733 h->use_weight_chroma= 0; | |
| 3734 return; | |
| 3735 } | |
| 3736 | |
| 3737 h->use_weight= 2; | |
| 3738 h->use_weight_chroma= 2; | |
| 3739 h->luma_log2_weight_denom= 5; | |
| 3740 h->chroma_log2_weight_denom= 5; | |
| 3741 | |
| 3742 /* FIXME: MBAFF */ | |
| 3743 for(ref0=0; ref0 < h->ref_count[0]; ref0++){ | |
| 3744 int poc0 = h->ref_list[0][ref0].poc; | |
| 3745 for(ref1=0; ref1 < h->ref_count[1]; ref1++){ | |
| 2519 | 3746 int poc1 = h->ref_list[1][ref1].poc; |
| 2415 | 3747 int td = clip(poc1 - poc0, -128, 127); |
| 3748 if(td){ | |
| 3749 int tb = clip(cur_poc - poc0, -128, 127); | |
| 3750 int tx = (16384 + (ABS(td) >> 1)) / td; | |
| 3751 int dist_scale_factor = clip((tb*tx + 32) >> 6, -1024, 1023) >> 2; | |
| 3752 if(dist_scale_factor < -64 || dist_scale_factor > 128) | |
| 3753 h->implicit_weight[ref0][ref1] = 32; | |
| 3754 else | |
| 3755 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor; | |
| 3756 }else | |
| 3757 h->implicit_weight[ref0][ref1] = 32; | |
| 3758 } | |
| 3759 } | |
| 3760 } | |
| 3761 | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3762 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
|
3763 int i; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3764 pic->reference=0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3765 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
|
3766 pic->reference=1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3767 else{ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3768 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
|
3769 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
|
3770 pic->reference=1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3771 break; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3772 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3773 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3774 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3775 |
| 1168 | 3776 /** |
| 2392 | 3777 * instantaneous decoder refresh. |
| 1168 | 3778 */ |
| 3779 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
|
3780 int i; |
| 1168 | 3781 |
|
2484
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3782 for(i=0; i<16; i++){ |
|
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3783 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
|
3784 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
|
3785 h->long_ref[i]= NULL; |
|
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3786 } |
| 1168 | 3787 } |
| 3788 h->long_ref_count=0; | |
| 3789 | |
| 3790 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
|
3791 unreference_pic(h, h->short_ref[i]); |
| 1168 | 3792 h->short_ref[i]= NULL; |
| 3793 } | |
| 3794 h->short_ref_count=0; | |
| 3795 } | |
| 3796 | |
| 2640 | 3797 /* forget old pics after a seek */ |
| 3798 static void flush_dpb(AVCodecContext *avctx){ | |
| 3799 H264Context *h= avctx->priv_data; | |
| 3800 int i; | |
| 3801 for(i=0; i<16; i++) | |
| 3802 h->delayed_pic[i]= NULL; | |
| 3803 h->delayed_output_pic= NULL; | |
| 3804 idr(h); | |
|
2751
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
3805 if(h->s.current_picture_ptr) |
|
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
3806 h->s.current_picture_ptr->reference= 0; |
| 2640 | 3807 } |
| 3808 | |
| 1168 | 3809 /** |
| 3810 * | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3811 * @return the removed picture or NULL if an error occurs |
| 1168 | 3812 */ |
| 3813 static Picture * remove_short(H264Context *h, int frame_num){ | |
| 1169 | 3814 MpegEncContext * const s = &h->s; |
| 1168 | 3815 int i; |
| 3816 | |
| 1169 | 3817 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
|
3818 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count); |
| 1169 | 3819 |
| 1168 | 3820 for(i=0; i<h->short_ref_count; i++){ |
| 3821 Picture *pic= h->short_ref[i]; | |
| 1169 | 3822 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
|
3823 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic); |
| 1168 | 3824 if(pic->frame_num == frame_num){ |
| 3825 h->short_ref[i]= NULL; | |
| 3826 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*)); | |
| 3827 h->short_ref_count--; | |
| 3828 return pic; | |
| 3829 } | |
| 3830 } | |
| 3831 return NULL; | |
| 3832 } | |
| 3833 | |
| 3834 /** | |
| 3835 * | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3836 * @return the removed picture or NULL if an error occurs |
| 1168 | 3837 */ |
| 3838 static Picture * remove_long(H264Context *h, int i){ | |
| 3839 Picture *pic; | |
| 3840 | |
| 3841 pic= h->long_ref[i]; | |
| 3842 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
|
3843 if(pic) h->long_ref_count--; |
| 1168 | 3844 |
| 3845 return pic; | |
| 3846 } | |
| 3847 | |
| 3848 /** | |
|
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
|
3849 * 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
|
3850 */ |
|
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
|
3851 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
|
3852 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
|
3853 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
|
3854 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
|
3855 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
|
3856 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
|
3857 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
|
3858 } |
|
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
|
3859 } |
|
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
|
3860 } |
|
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
|
3861 |
|
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
|
3862 /** |
|
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
|
3863 * 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
|
3864 */ |
|
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
|
3865 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
|
3866 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
|
3867 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
|
3868 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
|
3869 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
|
3870 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
|
3871 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
|
3872 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
|
3873 } |
|
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
|
3874 } |
|
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
|
3875 } |
|
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
|
3876 } |
|
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
|
3877 |
|
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
|
3878 /** |
| 1168 | 3879 * Executes the reference picture marking (memory management control operations). |
| 3880 */ | |
| 3881 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ | |
| 3882 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
|
3883 int i, j; |
| 1168 | 3884 int current_is_long=0; |
| 3885 Picture *pic; | |
| 3886 | |
| 3887 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
|
3888 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n"); |
| 1168 | 3889 |
| 3890 for(i=0; i<mmco_count; i++){ | |
| 3891 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
|
3892 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 | 3893 |
| 3894 switch(mmco[i].opcode){ | |
| 3895 case MMCO_SHORT2UNUSED: | |
| 3896 pic= remove_short(h, mmco[i].short_frame_num); | |
|
2766
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3897 if(pic) |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3898 unreference_pic(h, pic); |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3899 else if(s->avctx->debug&FF_DEBUG_MMCO) |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3900 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_short() failure\n"); |
| 1168 | 3901 break; |
| 3902 case MMCO_SHORT2LONG: | |
| 3903 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
|
3904 if(pic) unreference_pic(h, pic); |
| 1168 | 3905 |
| 3906 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num); | |
| 3907 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
|
3908 h->long_ref_count++; |
| 1168 | 3909 break; |
| 3910 case MMCO_LONG2UNUSED: | |
| 3911 pic= remove_long(h, mmco[i].long_index); | |
|
2766
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3912 if(pic) |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3913 unreference_pic(h, pic); |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3914 else if(s->avctx->debug&FF_DEBUG_MMCO) |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
3915 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_long() failure\n"); |
| 1168 | 3916 break; |
| 3917 case MMCO_LONG: | |
| 3918 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
|
3919 if(pic) unreference_pic(h, pic); |
| 1168 | 3920 |
| 3921 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr; | |
| 3922 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
| 3923 h->long_ref_count++; | |
| 3924 | |
| 3925 current_is_long=1; | |
| 3926 break; | |
| 3927 case MMCO_SET_MAX_LONG: | |
| 3928 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
|
3929 // 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
|
3930 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
|
3931 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
|
3932 if (pic) unreference_pic(h, pic); |
| 1168 | 3933 } |
| 3934 break; | |
| 3935 case MMCO_RESET: | |
| 3936 while(h->short_ref_count){ | |
| 3937 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
|
3938 unreference_pic(h, pic); |
| 1168 | 3939 } |
|
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
|
3940 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
|
3941 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
|
3942 if(pic) unreference_pic(h, pic); |
| 1168 | 3943 } |
| 3944 break; | |
| 3945 default: assert(0); | |
| 3946 } | |
| 3947 } | |
| 3948 | |
| 3949 if(!current_is_long){ | |
| 3950 pic= remove_short(h, s->current_picture_ptr->frame_num); | |
| 3951 if(pic){ | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3952 unreference_pic(h, pic); |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3953 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n"); |
| 1168 | 3954 } |
| 3955 | |
| 3956 if(h->short_ref_count) | |
| 1169 | 3957 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*)); |
| 3958 | |
| 3959 h->short_ref[0]= s->current_picture_ptr; | |
| 1168 | 3960 h->short_ref[0]->long_ref=0; |
| 3961 h->short_ref_count++; | |
| 3962 } | |
| 3963 | |
|
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
|
3964 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
|
3965 print_long_term(h); |
| 1168 | 3966 return 0; |
| 3967 } | |
| 3968 | |
| 3969 static int decode_ref_pic_marking(H264Context *h){ | |
| 3970 MpegEncContext * const s = &h->s; | |
| 3971 int i; | |
| 3972 | |
| 3973 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields | |
| 3974 s->broken_link= get_bits1(&s->gb) -1; | |
| 3975 h->mmco[0].long_index= get_bits1(&s->gb) - 1; // current_long_term_idx | |
| 3976 if(h->mmco[0].long_index == -1) | |
| 3977 h->mmco_index= 0; | |
| 3978 else{ | |
| 3979 h->mmco[0].opcode= MMCO_LONG; | |
| 3980 h->mmco_index= 1; | |
| 3981 } | |
| 3982 }else{ | |
| 3983 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
|
3984 for(i= 0; i<MAX_MMCO_COUNT; i++) { |
| 1168 | 3985 MMCOOpcode opcode= get_ue_golomb(&s->gb);; |
| 3986 | |
| 3987 h->mmco[i].opcode= opcode; | |
| 3988 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){ | |
| 3989 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 | |
| 3990 /* if(h->mmco[i].short_frame_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_frame_num ] == NULL){ | |
| 3991 fprintf(stderr, "illegal short ref in memory management control operation %d\n", mmco); | |
| 3992 return -1; | |
| 3993 }*/ | |
| 3994 } | |
| 3995 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){ | |
| 3996 h->mmco[i].long_index= get_ue_golomb(&s->gb); | |
| 3997 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
|
3998 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); |
| 1168 | 3999 return -1; |
| 4000 } | |
| 4001 } | |
| 4002 | |
| 4003 if(opcode > MMCO_LONG){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4004 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); |
| 1168 | 4005 return -1; |
| 4006 } | |
|
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
|
4007 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
|
4008 break; |
| 1168 | 4009 } |
| 4010 h->mmco_index= i; | |
| 4011 }else{ | |
| 4012 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count); | |
| 4013 | |
| 4014 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields | |
| 4015 h->mmco[0].opcode= MMCO_SHORT2UNUSED; | |
| 4016 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num; | |
| 4017 h->mmco_index= 1; | |
| 4018 }else | |
| 4019 h->mmco_index= 0; | |
| 4020 } | |
| 4021 } | |
| 4022 | |
| 4023 return 0; | |
| 4024 } | |
| 4025 | |
| 4026 static int init_poc(H264Context *h){ | |
| 4027 MpegEncContext * const s = &h->s; | |
| 4028 const int max_frame_num= 1<<h->sps.log2_max_frame_num; | |
| 4029 int field_poc[2]; | |
| 4030 | |
| 4031 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 4032 h->frame_num_offset= 0; | |
| 4033 }else{ | |
| 4034 if(h->frame_num < h->prev_frame_num) | |
| 4035 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num; | |
| 4036 else | |
| 4037 h->frame_num_offset= h->prev_frame_num_offset; | |
| 4038 } | |
| 4039 | |
| 4040 if(h->sps.poc_type==0){ | |
| 4041 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb; | |
| 4042 | |
|
2649
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4043 if(h->nal_unit_type == NAL_IDR_SLICE){ |
|
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4044 h->prev_poc_msb= |
|
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4045 h->prev_poc_lsb= 0; |
|
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4046 } |
|
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
4047 |
| 1168 | 4048 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2) |
| 4049 h->poc_msb = h->prev_poc_msb + max_poc_lsb; | |
| 4050 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2) | |
| 4051 h->poc_msb = h->prev_poc_msb - max_poc_lsb; | |
| 4052 else | |
| 4053 h->poc_msb = h->prev_poc_msb; | |
| 4054 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb); | |
| 4055 field_poc[0] = | |
| 4056 field_poc[1] = h->poc_msb + h->poc_lsb; | |
| 4057 if(s->picture_structure == PICT_FRAME) | |
| 4058 field_poc[1] += h->delta_poc_bottom; | |
| 4059 }else if(h->sps.poc_type==1){ | |
| 4060 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc; | |
| 4061 int i; | |
| 4062 | |
| 4063 if(h->sps.poc_cycle_length != 0) | |
| 4064 abs_frame_num = h->frame_num_offset + h->frame_num; | |
| 4065 else | |
| 4066 abs_frame_num = 0; | |
| 4067 | |
| 4068 if(h->nal_ref_idc==0 && abs_frame_num > 0) | |
| 4069 abs_frame_num--; | |
| 4070 | |
| 4071 expected_delta_per_poc_cycle = 0; | |
| 4072 for(i=0; i < h->sps.poc_cycle_length; i++) | |
| 4073 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse | |
| 4074 | |
| 4075 if(abs_frame_num > 0){ | |
| 4076 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length; | |
| 4077 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length; | |
| 4078 | |
| 4079 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle; | |
| 4080 for(i = 0; i <= frame_num_in_poc_cycle; i++) | |
| 4081 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ]; | |
| 4082 } else | |
| 4083 expectedpoc = 0; | |
| 4084 | |
| 4085 if(h->nal_ref_idc == 0) | |
| 4086 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic; | |
| 4087 | |
| 4088 field_poc[0] = expectedpoc + h->delta_poc[0]; | |
| 4089 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field; | |
| 4090 | |
| 4091 if(s->picture_structure == PICT_FRAME) | |
| 4092 field_poc[1] += h->delta_poc[1]; | |
| 4093 }else{ | |
| 4094 int poc; | |
| 4095 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 4096 poc= 0; | |
| 4097 }else{ | |
| 4098 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num); | |
| 4099 else poc= 2*(h->frame_num_offset + h->frame_num) - 1; | |
| 4100 } | |
| 4101 field_poc[0]= poc; | |
| 4102 field_poc[1]= poc; | |
| 4103 } | |
| 4104 | |
| 4105 if(s->picture_structure != PICT_BOTTOM_FIELD) | |
| 4106 s->current_picture_ptr->field_poc[0]= field_poc[0]; | |
| 4107 if(s->picture_structure != PICT_TOP_FIELD) | |
| 4108 s->current_picture_ptr->field_poc[1]= field_poc[1]; | |
| 4109 if(s->picture_structure == PICT_FRAME) // FIXME field pix? | |
| 4110 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]); | |
| 4111 | |
| 4112 return 0; | |
| 4113 } | |
| 4114 | |
| 4115 /** | |
| 4116 * decodes a slice header. | |
| 4117 * this will allso call MPV_common_init() and frame_start() as needed | |
| 4118 */ | |
| 4119 static int decode_slice_header(H264Context *h){ | |
| 4120 MpegEncContext * const s = &h->s; | |
| 4121 int first_mb_in_slice, pps_id; | |
| 4122 int num_ref_idx_active_override_flag; | |
| 4123 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
|
4124 int slice_type; |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4125 int default_ref_list_done = 0; |
| 1168 | 4126 |
| 4127 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
|
4128 s->dropable= h->nal_ref_idc == 0; |
| 1168 | 4129 |
| 4130 first_mb_in_slice= get_ue_golomb(&s->gb); | |
| 4131 | |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4132 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
|
4133 if(slice_type > 9){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4134 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 | 4135 return -1; |
| 1168 | 4136 } |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4137 if(slice_type > 4){ |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4138 slice_type -= 5; |
| 1168 | 4139 h->slice_type_fixed=1; |
| 4140 }else | |
| 4141 h->slice_type_fixed=0; | |
| 4142 | |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4143 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
|
4144 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
|
4145 || (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
|
4146 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
|
4147 } |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4148 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
|
4149 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4150 s->pict_type= h->slice_type; // to make a few old func happy, it's wrong though |
| 1168 | 4151 |
| 4152 pps_id= get_ue_golomb(&s->gb); | |
| 4153 if(pps_id>255){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4154 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n"); |
| 1168 | 4155 return -1; |
| 4156 } | |
| 4157 h->pps= h->pps_buffer[pps_id]; | |
| 1174 | 4158 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
|
4159 av_log(h->s.avctx, AV_LOG_ERROR, "non existing PPS referenced\n"); |
| 1174 | 4160 return -1; |
| 4161 } | |
| 4162 | |
| 1168 | 4163 h->sps= h->sps_buffer[ h->pps.sps_id ]; |
| 1174 | 4164 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
|
4165 av_log(h->s.avctx, AV_LOG_ERROR, "non existing SPS referenced\n"); |
| 1174 | 4166 return -1; |
| 4167 } | |
| 1168 | 4168 |
| 4169 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
|
4170 s->mb_height= h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag); |
| 1168 | 4171 |
| 2395 | 4172 h->b_stride= s->mb_width*4 + 1; |
| 4173 h->b8_stride= s->mb_width*2 + 1; | |
| 1168 | 4174 |
| 1371 | 4175 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right ); |
| 1168 | 4176 if(h->sps.frame_mbs_only_flag) |
| 1371 | 4177 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom); |
| 1168 | 4178 else |
| 1371 | 4179 s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck |
| 1168 | 4180 |
| 4181 if (s->context_initialized | |
| 1548 | 4182 && ( s->width != s->avctx->width || s->height != s->avctx->height)) { |
| 1168 | 4183 free_tables(h); |
| 4184 MPV_common_end(s); | |
| 4185 } | |
| 4186 if (!s->context_initialized) { | |
| 4187 if (MPV_common_init(s) < 0) | |
| 4188 return -1; | |
|
2758
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4189 |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4190 if(s->dsp.h264_idct_add == ff_h264_idct_add_c){ //FIXME little ugly |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4191 memcpy(h->zigzag_scan, zigzag_scan, 16*sizeof(uint8_t)); |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4192 memcpy(h-> field_scan, field_scan, 16*sizeof(uint8_t)); |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4193 }else{ |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4194 int i; |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4195 for(i=0; i<16; i++){ |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4196 #define T(x) (x>>2) | ((x<<2) & 0xF) |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4197 h->zigzag_scan[i] = T(zigzag_scan[i]); |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4198 h-> field_scan[i] = T( field_scan[i]); |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4199 } |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4200 } |
| 2763 | 4201 if(h->sps.transform_bypass){ //FIXME same ugly |
| 4202 h->zigzag_scan_q0 = zigzag_scan; | |
| 4203 h->field_scan_q0 = field_scan; | |
| 4204 }else{ | |
| 4205 h->zigzag_scan_q0 = h->zigzag_scan; | |
| 4206 h->field_scan_q0 = h->field_scan; | |
| 4207 } | |
| 1168 | 4208 |
| 4209 alloc_tables(h); | |
| 4210 | |
| 4211 s->avctx->width = s->width; | |
| 4212 s->avctx->height = s->height; | |
| 1548 | 4213 s->avctx->sample_aspect_ratio= h->sps.sar; |
| 2440 | 4214 if(!s->avctx->sample_aspect_ratio.den) |
| 4215 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
|
4216 |
| 2648 | 4217 if(h->sps.timing_info_present_flag){ |
| 2637 | 4218 s->avctx->time_base= (AVRational){h->sps.num_units_in_tick, h->sps.time_scale}; |
|
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
|
4219 } |
| 1168 | 4220 } |
| 4221 | |
| 2392 | 4222 if(h->slice_num == 0){ |
| 1168 | 4223 frame_start(h); |
| 4224 } | |
| 4225 | |
| 1169 | 4226 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup |
| 1168 | 4227 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num); |
| 4228 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4229 h->mb_aff_frame = 0; |
| 1168 | 4230 if(h->sps.frame_mbs_only_flag){ |
| 4231 s->picture_structure= PICT_FRAME; | |
| 4232 }else{ | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4233 if(get_bits1(&s->gb)) { //field_pic_flag |
| 1168 | 4234 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4235 } else { |
| 1168 | 4236 s->picture_structure= PICT_FRAME; |
|
2773
1d1b328d07ce
fixing first_mb_in_slice if frame_mbs_only_flag==0 && mb_aff==0
michael
parents:
2772
diff
changeset
|
4237 first_mb_in_slice <<= h->sps.mb_aff; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4238 h->mb_aff_frame = h->sps.mb_aff; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4239 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4240 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4241 |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4242 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4243 s->resync_mb_y = s->mb_y = first_mb_in_slice / s->mb_width; |
| 2772 | 4244 if(s->mb_y >= s->mb_height){ |
| 4245 return -1; | |
| 4246 } | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4247 |
| 1168 | 4248 if(s->picture_structure==PICT_FRAME){ |
| 4249 h->curr_pic_num= h->frame_num; | |
| 4250 h->max_pic_num= 1<< h->sps.log2_max_frame_num; | |
| 4251 }else{ | |
| 4252 h->curr_pic_num= 2*h->frame_num; | |
| 4253 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); | |
| 4254 } | |
| 4255 | |
| 4256 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 1453 | 4257 get_ue_golomb(&s->gb); /* idr_pic_id */ |
| 1168 | 4258 } |
| 4259 | |
| 4260 if(h->sps.poc_type==0){ | |
| 4261 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb); | |
| 4262 | |
| 4263 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){ | |
| 4264 h->delta_poc_bottom= get_se_golomb(&s->gb); | |
| 4265 } | |
| 4266 } | |
| 4267 | |
| 4268 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){ | |
| 4269 h->delta_poc[0]= get_se_golomb(&s->gb); | |
| 4270 | |
| 4271 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME) | |
| 4272 h->delta_poc[1]= get_se_golomb(&s->gb); | |
| 4273 } | |
| 4274 | |
| 4275 init_poc(h); | |
| 4276 | |
| 4277 if(h->pps.redundant_pic_cnt_present){ | |
| 4278 h->redundant_pic_count= get_ue_golomb(&s->gb); | |
| 4279 } | |
| 4280 | |
| 4281 //set defaults, might be overriden a few line later | |
| 4282 h->ref_count[0]= h->pps.ref_count[0]; | |
| 4283 h->ref_count[1]= h->pps.ref_count[1]; | |
| 4284 | |
| 4285 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){ | |
| 4286 if(h->slice_type == B_TYPE){ | |
| 4287 h->direct_spatial_mv_pred= get_bits1(&s->gb); | |
| 4288 } | |
| 4289 num_ref_idx_active_override_flag= get_bits1(&s->gb); | |
| 4290 | |
| 4291 if(num_ref_idx_active_override_flag){ | |
| 4292 h->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
| 4293 if(h->slice_type==B_TYPE) | |
| 4294 h->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
| 4295 | |
| 4296 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
|
4297 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n"); |
| 1168 | 4298 return -1; |
| 4299 } | |
| 4300 } | |
| 4301 } | |
| 4302 | |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4303 if(!default_ref_list_done){ |
| 1168 | 4304 fill_default_ref_list(h); |
| 4305 } | |
| 4306 | |
|
2766
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4307 if(decode_ref_pic_list_reordering(h) < 0) |
|
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
4308 return -1; |
| 1168 | 4309 |
| 4310 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE )) | |
| 4311 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) ) | |
| 4312 pred_weight_table(h); | |
| 2415 | 4313 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE) |
| 4314 implicit_weight_table(h); | |
| 4315 else | |
| 4316 h->use_weight = 0; | |
| 1168 | 4317 |
|
2580
b4f6f89ec2f6
The cvs version 1.103 of h264.c brokes 13 conformance streams, this
michael
parents:
2561
diff
changeset
|
4318 if(s->current_picture.reference) |
| 1168 | 4319 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
|
4320 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4321 if( 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
|
4322 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
|
4323 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4324 h->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
|
4325 s->qscale = h->pps.init_qp + get_se_golomb(&s->gb); |
| 1898 | 4326 if(s->qscale<0 || s->qscale>51){ |
| 4327 av_log(s->avctx, AV_LOG_ERROR, "QP %d out of range\n", s->qscale); | |
| 4328 return -1; | |
| 4329 } | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4330 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale); |
| 1168 | 4331 //FIXME qscale / qp ... stuff |
| 4332 if(h->slice_type == SP_TYPE){ | |
| 1453 | 4333 get_bits1(&s->gb); /* sp_for_switch_flag */ |
| 1168 | 4334 } |
| 4335 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){ | |
| 1453 | 4336 get_se_golomb(&s->gb); /* slice_qs_delta */ |
| 1168 | 4337 } |
| 4338 | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4339 h->deblocking_filter = 1; |
| 1898 | 4340 h->slice_alpha_c0_offset = 0; |
| 4341 h->slice_beta_offset = 0; | |
| 1168 | 4342 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
|
4343 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
|
4344 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
|
4345 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
|
4346 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4347 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
|
4348 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
|
4349 h->slice_beta_offset = get_se_golomb(&s->gb) << 1; |
| 1168 | 4350 } |
|
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
|
4351 } |
| 1168 | 4352 |
| 4353 #if 0 //FMO | |
| 4354 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5) | |
| 4355 slice_group_change_cycle= get_bits(&s->gb, ?); | |
| 4356 #endif | |
| 4357 | |
| 2392 | 4358 h->slice_num++; |
| 4359 | |
| 1168 | 4360 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
| 2583 | 4361 av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c pps:%d frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s\n", |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4362 h->slice_num, |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4363 (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
|
4364 first_mb_in_slice, |
| 1264 | 4365 av_get_pict_type_char(h->slice_type), |
| 1168 | 4366 pps_id, h->frame_num, |
| 4367 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], | |
| 4368 h->ref_count[0], h->ref_count[1], | |
| 4369 s->qscale, | |
| 2583 | 4370 h->deblocking_filter, h->slice_alpha_c0_offset/2, h->slice_beta_offset/2, |
| 2415 | 4371 h->use_weight, |
| 4372 h->use_weight==1 && h->use_weight_chroma ? "c" : "" | |
| 1168 | 4373 ); |
| 4374 } | |
| 4375 | |
| 4376 return 0; | |
| 4377 } | |
| 4378 | |
| 4379 /** | |
| 4380 * | |
| 4381 */ | |
| 4382 static inline int get_level_prefix(GetBitContext *gb){ | |
| 4383 unsigned int buf; | |
| 4384 int log; | |
| 4385 | |
| 4386 OPEN_READER(re, gb); | |
| 4387 UPDATE_CACHE(re, gb); | |
| 4388 buf=GET_CACHE(re, gb); | |
| 4389 | |
| 4390 log= 32 - av_log2(buf); | |
| 4391 #ifdef TRACE | |
| 4392 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
|
4393 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 | 4394 #endif |
| 4395 | |
| 4396 LAST_SKIP_BITS(re, gb, log); | |
| 4397 CLOSE_READER(re, gb); | |
| 4398 | |
| 4399 return log-1; | |
| 4400 } | |
| 4401 | |
| 2755 | 4402 static inline int get_dct8x8_allowed(H264Context *h){ |
| 4403 int i; | |
| 4404 for(i=0; i<4; i++){ | |
| 4405 if(!IS_SUB_8X8(h->sub_mb_type[i]) | |
|
2781
899a2ea0907c
parenthesing to avoid compiler errors in the future - compared asm outputs, behaviour didnt changed
alex
parents:
2774
diff
changeset
|
4406 || (!h->sps.direct_8x8_inference_flag && IS_DIRECT(h->sub_mb_type[i]))) |
| 2755 | 4407 return 0; |
| 4408 } | |
| 4409 return 1; | |
| 4410 } | |
| 4411 | |
| 1168 | 4412 /** |
| 4413 * decodes a residual block. | |
| 4414 * @param n block index | |
| 4415 * @param scantable scantable | |
| 4416 * @param max_coeff number of coefficients in the block | |
| 4417 * @return <0 if an error occured | |
| 4418 */ | |
| 2755 | 4419 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint16_t *qmul, int max_coeff){ |
| 1168 | 4420 MpegEncContext * const s = &h->s; |
| 4421 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}; | |
| 4422 int level[16], run[16]; | |
| 4423 int suffix_length, zeros_left, coeff_num, coeff_token, total_coeff, i, trailing_ones; | |
| 4424 | |
| 4425 //FIXME put trailing_onex into the context | |
| 4426 | |
| 4427 if(n == CHROMA_DC_BLOCK_INDEX){ | |
| 4428 coeff_token= get_vlc2(gb, chroma_dc_coeff_token_vlc.table, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 1); | |
| 4429 total_coeff= coeff_token>>2; | |
| 4430 }else{ | |
| 4431 if(n == LUMA_DC_BLOCK_INDEX){ | |
| 4432 total_coeff= pred_non_zero_count(h, 0); | |
| 4433 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
| 4434 total_coeff= coeff_token>>2; | |
| 4435 }else{ | |
| 4436 total_coeff= pred_non_zero_count(h, n); | |
| 4437 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
| 4438 total_coeff= coeff_token>>2; | |
| 4439 h->non_zero_count_cache[ scan8[n] ]= total_coeff; | |
| 4440 } | |
| 4441 } | |
| 4442 | |
| 4443 //FIXME set last_non_zero? | |
| 4444 | |
| 4445 if(total_coeff==0) | |
| 4446 return 0; | |
| 4447 | |
| 4448 trailing_ones= coeff_token&3; | |
| 1170 | 4449 tprintf("trailing:%d, total:%d\n", trailing_ones, total_coeff); |
| 1168 | 4450 assert(total_coeff<=16); |
| 4451 | |
| 4452 for(i=0; i<trailing_ones; i++){ | |
| 4453 level[i]= 1 - 2*get_bits1(gb); | |
| 4454 } | |
| 4455 | |
| 4456 suffix_length= total_coeff > 10 && trailing_ones < 3; | |
| 4457 | |
| 4458 for(; i<total_coeff; i++){ | |
| 4459 const int prefix= get_level_prefix(gb); | |
| 4460 int level_code, mask; | |
| 4461 | |
| 4462 if(prefix<14){ //FIXME try to build a large unified VLC table for all this | |
| 4463 if(suffix_length) | |
| 4464 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
| 4465 else | |
| 4466 level_code= (prefix<<suffix_length); //part | |
| 4467 }else if(prefix==14){ | |
| 4468 if(suffix_length) | |
| 4469 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
| 4470 else | |
| 4471 level_code= prefix + get_bits(gb, 4); //part | |
| 4472 }else if(prefix==15){ | |
| 4473 level_code= (prefix<<suffix_length) + get_bits(gb, 12); //part | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4474 if(suffix_length==0) level_code+=15; //FIXME doesn't make (much)sense |
| 1168 | 4475 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4476 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 4477 return -1; |
| 4478 } | |
| 4479 | |
| 4480 if(i==trailing_ones && i<3) level_code+= 2; //FIXME split first iteration | |
| 4481 | |
| 4482 mask= -(level_code&1); | |
| 4483 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
| 4484 | |
| 4485 if(suffix_length==0) suffix_length=1; //FIXME split first iteration | |
| 4486 | |
| 4487 #if 1 | |
| 4488 if(ABS(level[i]) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++; | |
| 4489 #else | |
| 4490 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
|
4491 /* ? == prefix > 2 or sth */ |
| 1168 | 4492 #endif |
| 1170 | 4493 tprintf("level: %d suffix_length:%d\n", level[i], suffix_length); |
| 1168 | 4494 } |
| 4495 | |
| 4496 if(total_coeff == max_coeff) | |
| 4497 zeros_left=0; | |
| 4498 else{ | |
| 4499 if(n == CHROMA_DC_BLOCK_INDEX) | |
| 4500 zeros_left= get_vlc2(gb, chroma_dc_total_zeros_vlc[ total_coeff-1 ].table, CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 1); | |
| 4501 else | |
| 4502 zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1); | |
| 4503 } | |
| 4504 | |
| 4505 for(i=0; i<total_coeff-1; i++){ | |
| 4506 if(zeros_left <=0) | |
| 4507 break; | |
| 4508 else if(zeros_left < 7){ | |
| 4509 run[i]= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
| 4510 }else{ | |
| 4511 run[i]= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
| 4512 } | |
| 4513 zeros_left -= run[i]; | |
| 4514 } | |
| 4515 | |
| 4516 if(zeros_left<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4517 av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 4518 return -1; |
| 4519 } | |
| 4520 | |
| 4521 for(; i<total_coeff-1; i++){ | |
| 4522 run[i]= 0; | |
| 4523 } | |
| 4524 | |
| 4525 run[i]= zeros_left; | |
| 4526 | |
| 4527 coeff_num=-1; | |
| 4528 if(n > 24){ | |
| 4529 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
| 4530 int j; | |
| 4531 | |
| 4532 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
| 4533 j= scantable[ coeff_num ]; | |
| 4534 | |
| 4535 block[j]= level[i]; | |
| 4536 } | |
| 4537 }else{ | |
| 4538 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
| 4539 int j; | |
| 4540 | |
| 4541 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
| 4542 j= scantable[ coeff_num ]; | |
| 4543 | |
| 4544 block[j]= level[i] * qmul[j]; | |
| 4545 // printf("%d %d ", block[j], qmul[j]); | |
| 4546 } | |
| 4547 } | |
| 4548 return 0; | |
| 4549 } | |
| 4550 | |
| 4551 /** | |
| 2396 | 4552 * decodes a P_SKIP or B_SKIP macroblock |
| 4553 */ | |
| 4554 static void decode_mb_skip(H264Context *h){ | |
| 4555 MpegEncContext * const s = &h->s; | |
| 4556 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; | |
|
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4557 int mb_type=0; |
| 2396 | 4558 |
| 4559 memset(h->non_zero_count[mb_xy], 0, 16); | |
| 4560 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui | |
| 4561 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4562 if(h->mb_aff_frame && s->mb_skip_run==0 && (s->mb_y&1)==0){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4563 h->mb_field_decoding_flag= get_bits1(&s->gb); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4564 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4565 if(h->mb_field_decoding_flag) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4566 mb_type|= MB_TYPE_INTERLACED; |
|
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4567 |
| 2396 | 4568 if( h->slice_type == B_TYPE ) |
| 4569 { | |
| 4570 // just for fill_caches. pred_direct_motion will set the real mb_type | |
|
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4571 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP; |
| 2396 | 4572 |
| 2449 | 4573 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
| 2396 | 4574 pred_direct_motion(h, &mb_type); |
| 4575 if(h->pps.cabac){ | |
| 4576 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 4577 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 4578 } | |
| 4579 } | |
| 4580 else | |
| 4581 { | |
| 4582 int mx, my; | |
|
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4583 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; |
| 2396 | 4584 |
| 2449 | 4585 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
| 2396 | 4586 pred_pskip_motion(h, &mx, &my); |
| 4587 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
| 4588 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); | |
| 4589 if(h->pps.cabac) | |
| 4590 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 4591 } | |
| 4592 | |
| 4593 write_back_motion(h, mb_type); | |
| 4594 s->current_picture.mb_type[mb_xy]= mb_type|MB_TYPE_SKIP; | |
| 4595 s->current_picture.qscale_table[mb_xy]= s->qscale; | |
| 4596 h->slice_table[ mb_xy ]= h->slice_num; | |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
4597 h->prev_mb_skipped= 1; |
| 2396 | 4598 } |
| 4599 | |
| 4600 /** | |
| 1168 | 4601 * decodes a macroblock |
| 4602 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed | |
| 4603 */ | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4604 static int decode_mb_cavlc(H264Context *h){ |
| 1168 | 4605 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
|
4606 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1169 | 4607 int mb_type, partition_count, cbp; |
| 2755 | 4608 int dct8x8_allowed= h->pps.transform_8x8_mode; |
| 1168 | 4609 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4610 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong? |
| 1168 | 4611 |
| 1170 | 4612 tprintf("pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
| 1453 | 4613 cbp = 0; /* avoid warning. FIXME: find a solution without slowing |
| 4614 down the code */ | |
| 1168 | 4615 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){ |
| 4616 if(s->mb_skip_run==-1) | |
| 4617 s->mb_skip_run= get_ue_golomb(&s->gb); | |
| 4618 | |
| 4619 if (s->mb_skip_run--) { | |
| 2396 | 4620 decode_mb_skip(h); |
| 1168 | 4621 return 0; |
| 4622 } | |
| 4623 } | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4624 if(h->mb_aff_frame){ |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
4625 if ( ((s->mb_y&1) == 0) || h->prev_mb_skipped) |
| 1168 | 4626 h->mb_field_decoding_flag = get_bits1(&s->gb); |
| 4627 }else | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4628 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); |
| 1168 | 4629 |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
4630 h->prev_mb_skipped= 0; |
| 1168 | 4631 |
| 4632 mb_type= get_ue_golomb(&s->gb); | |
| 4633 if(h->slice_type == B_TYPE){ | |
| 4634 if(mb_type < 23){ | |
| 4635 partition_count= b_mb_type_info[mb_type].partition_count; | |
| 4636 mb_type= b_mb_type_info[mb_type].type; | |
| 4637 }else{ | |
| 4638 mb_type -= 23; | |
| 4639 goto decode_intra_mb; | |
| 4640 } | |
| 4641 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){ | |
| 4642 if(mb_type < 5){ | |
| 4643 partition_count= p_mb_type_info[mb_type].partition_count; | |
| 4644 mb_type= p_mb_type_info[mb_type].type; | |
| 4645 }else{ | |
| 4646 mb_type -= 5; | |
| 4647 goto decode_intra_mb; | |
| 4648 } | |
| 4649 }else{ | |
| 4650 assert(h->slice_type == I_TYPE); | |
| 4651 decode_intra_mb: | |
| 4652 if(mb_type > 25){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4653 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 | 4654 return -1; |
| 4655 } | |
| 4656 partition_count=0; | |
| 4657 cbp= i_mb_type_info[mb_type].cbp; | |
| 4658 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; | |
| 4659 mb_type= i_mb_type_info[mb_type].type; | |
| 4660 } | |
| 4661 | |
| 4662 if(h->mb_field_decoding_flag) | |
| 4663 mb_type |= MB_TYPE_INTERLACED; | |
| 4664 | |
| 4665 h->slice_table[ mb_xy ]= h->slice_num; | |
| 4666 | |
| 4667 if(IS_INTRA_PCM(mb_type)){ | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4668 unsigned int x, y; |
| 1168 | 4669 |
| 4670 // we assume these blocks are very rare so we dont optimize it | |
| 4671 align_get_bits(&s->gb); | |
| 4672 | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4673 // The pixels are stored in the same order as levels in h->mb array. |
| 1168 | 4674 for(y=0; y<16; y++){ |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4675 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3); |
| 1168 | 4676 for(x=0; x<16; x++){ |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4677 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
|
4678 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= get_bits(&s->gb, 8); |
| 1168 | 4679 } |
| 4680 } | |
| 4681 for(y=0; y<8; y++){ | |
| 4682 const int index= 256 + 4*(y&3) + 32*(y>>2); | |
| 4683 for(x=0; x<8; x++){ | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4684 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
|
4685 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
| 1168 | 4686 } |
| 4687 } | |
| 4688 for(y=0; y<8; y++){ | |
| 4689 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); | |
| 4690 for(x=0; x<8; x++){ | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4691 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
|
4692 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
| 1168 | 4693 } |
| 4694 } | |
| 4695 | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4696 // In deblocking, the quantizer is 0 |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4697 s->current_picture.qscale_table[mb_xy]= 0; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4698 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, 0); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4699 // All coeffs are present |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4700 memset(h->non_zero_count[mb_xy], 16, 16); |
| 1168 | 4701 |
| 2755 | 4702 s->current_picture.mb_type[mb_xy]= mb_type; |
| 1168 | 4703 return 0; |
| 4704 } | |
| 4705 | |
| 2449 | 4706 fill_caches(h, mb_type, 0); |
| 1168 | 4707 |
| 4708 //mb_pred | |
| 4709 if(IS_INTRA(mb_type)){ | |
| 4710 // init_top_left_availability(h); | |
| 4711 if(IS_INTRA4x4(mb_type)){ | |
| 4712 int i; | |
| 2755 | 4713 int di = 1; |
| 4714 if(dct8x8_allowed && get_bits1(&s->gb)){ | |
| 4715 mb_type |= MB_TYPE_8x8DCT; | |
| 4716 di = 4; | |
| 4717 } | |
| 1168 | 4718 |
| 4719 // fill_intra4x4_pred_table(h); | |
| 2755 | 4720 for(i=0; i<16; i+=di){ |
| 1168 | 4721 const int mode_coded= !get_bits1(&s->gb); |
| 4722 const int predicted_mode= pred_intra_mode(h, i); | |
| 4723 int mode; | |
| 4724 | |
| 4725 if(mode_coded){ | |
| 4726 const int rem_mode= get_bits(&s->gb, 3); | |
| 4727 if(rem_mode<predicted_mode) | |
| 4728 mode= rem_mode; | |
| 4729 else | |
| 4730 mode= rem_mode + 1; | |
| 4731 }else{ | |
| 4732 mode= predicted_mode; | |
| 4733 } | |
| 4734 | |
| 2755 | 4735 if(di==4) |
| 4736 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 ); | |
| 4737 else | |
| 4738 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode; | |
| 1168 | 4739 } |
| 4740 write_back_intra_pred_mode(h); | |
| 4741 if( check_intra4x4_pred_mode(h) < 0) | |
| 4742 return -1; | |
| 4743 }else{ | |
| 4744 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode); | |
| 4745 if(h->intra16x16_pred_mode < 0) | |
| 4746 return -1; | |
| 4747 } | |
| 4748 h->chroma_pred_mode= get_ue_golomb(&s->gb); | |
| 4749 | |
| 4750 h->chroma_pred_mode= check_intra_pred_mode(h, h->chroma_pred_mode); | |
| 4751 if(h->chroma_pred_mode < 0) | |
| 4752 return -1; | |
| 4753 }else if(partition_count==4){ | |
| 4754 int i, j, sub_partition_count[4], list, ref[2][4]; | |
| 4755 | |
| 4756 if(h->slice_type == B_TYPE){ | |
| 4757 for(i=0; i<4; i++){ | |
| 4758 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
| 4759 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
|
4760 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 | 4761 return -1; |
| 4762 } | |
| 4763 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
| 4764 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
| 4765 } | |
| 2396 | 4766 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1]) |
| 4767 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) | |
| 4768 pred_direct_motion(h, &mb_type); | |
| 1168 | 4769 }else{ |
| 4770 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ? | |
| 4771 for(i=0; i<4; i++){ | |
| 4772 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
| 4773 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
|
4774 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 | 4775 return -1; |
| 4776 } | |
| 4777 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
| 4778 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
| 4779 } | |
| 4780 } | |
| 4781 | |
| 4782 for(list=0; list<2; list++){ | |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
4783 int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; |
| 1168 | 4784 if(ref_count == 0) continue; |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
4785 if (h->mb_aff_frame && h->mb_field_decoding_flag) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
4786 ref_count <<= 1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
4787 } |
| 1168 | 4788 for(i=0; i<4; i++){ |
| 2396 | 4789 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
| 4790 if(IS_DIR(h->sub_mb_type[i], 0, list)){ | |
| 1168 | 4791 ref[list][i] = get_te0_golomb(&s->gb, ref_count); //FIXME init to 0 before and skip? |
| 4792 }else{ | |
| 4793 //FIXME | |
| 4794 ref[list][i] = -1; | |
| 4795 } | |
| 4796 } | |
| 4797 } | |
| 4798 | |
| 2755 | 4799 if(dct8x8_allowed) |
| 4800 dct8x8_allowed = get_dct8x8_allowed(h); | |
| 4801 | |
| 1168 | 4802 for(list=0; list<2; list++){ |
| 4803 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; | |
| 4804 if(ref_count == 0) continue; | |
| 4805 | |
| 4806 for(i=0; i<4; i++){ | |
| 2396 | 4807 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
| 1168 | 4808 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]= |
| 4809 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i]; | |
| 4810 | |
| 2396 | 4811 if(IS_DIR(h->sub_mb_type[i], 0, list)){ |
| 1168 | 4812 const int sub_mb_type= h->sub_mb_type[i]; |
| 4813 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1; | |
| 4814 for(j=0; j<sub_partition_count[i]; j++){ | |
| 4815 int mx, my; | |
| 4816 const int index= 4*i + block_width*j; | |
| 4817 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ]; | |
| 4818 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my); | |
| 4819 mx += get_se_golomb(&s->gb); | |
| 4820 my += get_se_golomb(&s->gb); | |
| 1170 | 4821 tprintf("final mv:%d %d\n", mx, my); |
| 4822 | |
| 1168 | 4823 if(IS_SUB_8X8(sub_mb_type)){ |
| 4824 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= | |
| 4825 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; | |
| 4826 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= | |
| 4827 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my; | |
| 4828 }else if(IS_SUB_8X4(sub_mb_type)){ | |
| 4829 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx; | |
| 4830 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my; | |
| 4831 }else if(IS_SUB_4X8(sub_mb_type)){ | |
| 4832 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx; | |
| 4833 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my; | |
| 4834 }else{ | |
| 4835 assert(IS_SUB_4X4(sub_mb_type)); | |
| 4836 mv_cache[ 0 ][0]= mx; | |
| 4837 mv_cache[ 0 ][1]= my; | |
| 4838 } | |
| 4839 } | |
| 4840 }else{ | |
| 4841 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0]; | |
| 4842 p[0] = p[1]= | |
| 4843 p[8] = p[9]= 0; | |
| 4844 } | |
| 4845 } | |
| 4846 } | |
| 2396 | 4847 }else if(IS_DIRECT(mb_type)){ |
| 4848 pred_direct_motion(h, &mb_type); | |
| 2755 | 4849 dct8x8_allowed &= h->sps.direct_8x8_inference_flag; |
| 2396 | 4850 }else{ |
| 1168 | 4851 int list, mx, my, i; |
| 4852 //FIXME we should set ref_idx_l? to 0 if we use that later ... | |
| 4853 if(IS_16X16(mb_type)){ | |
| 4854 for(list=0; list<2; list++){ | |
| 2392 | 4855 if(h->ref_count[list]>0){ |
| 1168 | 4856 if(IS_DIR(mb_type, 0, list)){ |
| 4857 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
| 4858 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | |
| 2523 | 4859 }else |
| 4860 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (LIST_NOT_USED&0xFF), 1); | |
| 1168 | 4861 } |
| 4862 } | |
| 4863 for(list=0; list<2; list++){ | |
| 4864 if(IS_DIR(mb_type, 0, list)){ | |
| 4865 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); | |
| 4866 mx += get_se_golomb(&s->gb); | |
| 4867 my += get_se_golomb(&s->gb); | |
| 1170 | 4868 tprintf("final mv:%d %d\n", mx, my); |
| 4869 | |
| 1269 | 4870 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
| 2523 | 4871 }else |
| 4872 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4); | |
| 1168 | 4873 } |
| 4874 } | |
| 4875 else if(IS_16X8(mb_type)){ | |
| 4876 for(list=0; list<2; list++){ | |
| 4877 if(h->ref_count[list]>0){ | |
| 4878 for(i=0; i<2; i++){ | |
| 4879 if(IS_DIR(mb_type, i, list)){ | |
| 4880 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
| 4881 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); | |
| 2523 | 4882 }else |
| 2396 | 4883 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, (LIST_NOT_USED&0xFF), 1); |
| 1168 | 4884 } |
| 4885 } | |
| 4886 } | |
| 4887 for(list=0; list<2; list++){ | |
| 4888 for(i=0; i<2; i++){ | |
| 4889 if(IS_DIR(mb_type, i, list)){ | |
| 4890 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my); | |
| 4891 mx += get_se_golomb(&s->gb); | |
| 4892 my += get_se_golomb(&s->gb); | |
| 1170 | 4893 tprintf("final mv:%d %d\n", mx, my); |
| 4894 | |
| 1269 | 4895 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
| 2396 | 4896 }else |
| 4897 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); | |
| 1168 | 4898 } |
| 4899 } | |
| 4900 }else{ | |
| 4901 assert(IS_8X16(mb_type)); | |
| 4902 for(list=0; list<2; list++){ | |
| 4903 if(h->ref_count[list]>0){ | |
| 4904 for(i=0; i<2; i++){ | |
| 4905 if(IS_DIR(mb_type, i, list)){ //FIXME optimize | |
| 4906 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
| 4907 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); | |
| 2523 | 4908 }else |
| 2396 | 4909 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, (LIST_NOT_USED&0xFF), 1); |
| 1168 | 4910 } |
| 4911 } | |
| 4912 } | |
| 4913 for(list=0; list<2; list++){ | |
| 4914 for(i=0; i<2; i++){ | |
| 4915 if(IS_DIR(mb_type, i, list)){ | |
| 4916 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my); | |
| 4917 mx += get_se_golomb(&s->gb); | |
| 4918 my += get_se_golomb(&s->gb); | |
| 1170 | 4919 tprintf("final mv:%d %d\n", mx, my); |
| 4920 | |
| 1269 | 4921 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
| 2396 | 4922 }else |
| 4923 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); | |
| 1168 | 4924 } |
| 4925 } | |
| 4926 } | |
| 4927 } | |
| 4928 | |
| 4929 if(IS_INTER(mb_type)) | |
| 4930 write_back_motion(h, mb_type); | |
| 4931 | |
| 4932 if(!IS_INTRA16x16(mb_type)){ | |
| 4933 cbp= get_ue_golomb(&s->gb); | |
| 4934 if(cbp > 47){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4935 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%d) at %d %d\n", cbp, s->mb_x, s->mb_y); |
| 1168 | 4936 return -1; |
| 4937 } | |
| 4938 | |
| 4939 if(IS_INTRA4x4(mb_type)) | |
| 4940 cbp= golomb_to_intra4x4_cbp[cbp]; | |
| 4941 else | |
| 4942 cbp= golomb_to_inter_cbp[cbp]; | |
| 4943 } | |
| 4944 | |
| 2755 | 4945 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){ |
| 4946 if(get_bits1(&s->gb)) | |
| 4947 mb_type |= MB_TYPE_8x8DCT; | |
| 4948 } | |
| 4949 s->current_picture.mb_type[mb_xy]= mb_type; | |
| 4950 | |
| 1168 | 4951 if(cbp || IS_INTRA16x16(mb_type)){ |
| 4952 int i8x8, i4x4, chroma_idx; | |
| 4953 int chroma_qp, dquant; | |
| 4954 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr; | |
| 4955 const uint8_t *scan, *dc_scan; | |
| 4956 | |
| 4957 // fill_non_zero_count_cache(h); | |
| 4958 | |
| 4959 if(IS_INTERLACED(mb_type)){ | |
| 2763 | 4960 scan= s->qscale ? h->field_scan : h->field_scan_q0; |
| 1168 | 4961 dc_scan= luma_dc_field_scan; |
| 4962 }else{ | |
| 2763 | 4963 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0; |
| 1168 | 4964 dc_scan= luma_dc_zigzag_scan; |
| 4965 } | |
| 4966 | |
| 4967 dquant= get_se_golomb(&s->gb); | |
| 4968 | |
| 4969 if( dquant > 25 || dquant < -26 ){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4970 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 | 4971 return -1; |
| 4972 } | |
| 4973 | |
| 4974 s->qscale += dquant; | |
| 4975 if(((unsigned)s->qscale) > 51){ | |
| 4976 if(s->qscale<0) s->qscale+= 52; | |
| 4977 else s->qscale-= 52; | |
| 4978 } | |
| 4979 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4980 h->chroma_qp= chroma_qp= get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale); |
| 1168 | 4981 if(IS_INTRA16x16(mb_type)){ |
| 2763 | 4982 if( decode_residual(h, h->intra_gb_ptr, h->mb, LUMA_DC_BLOCK_INDEX, dc_scan, h->dequant4_coeff[s->qscale], 16) < 0){ |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4983 return -1; //FIXME continue if partitioned and other return -1 too |
| 1168 | 4984 } |
| 4985 | |
| 4986 assert((cbp&15) == 0 || (cbp&15) == 15); | |
| 4987 | |
| 4988 if(cbp&15){ | |
| 4989 for(i8x8=0; i8x8<4; i8x8++){ | |
| 4990 for(i4x4=0; i4x4<4; i4x4++){ | |
| 4991 const int index= i4x4 + 4*i8x8; | |
| 2763 | 4992 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[s->qscale], 15) < 0 ){ |
| 1168 | 4993 return -1; |
| 4994 } | |
| 4995 } | |
| 4996 } | |
| 4997 }else{ | |
| 1636 | 4998 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1); |
| 1168 | 4999 } |
| 5000 }else{ | |
| 5001 for(i8x8=0; i8x8<4; i8x8++){ | |
| 5002 if(cbp & (1<<i8x8)){ | |
| 2755 | 5003 if(IS_8x8DCT(mb_type)){ |
| 5004 DCTELEM *buf = &h->mb[64*i8x8]; | |
| 2757 | 5005 uint8_t *nnz; |
| 2755 | 5006 for(i4x4=0; i4x4<4; i4x4++){ |
| 5007 if( decode_residual(h, gb, buf, i4x4+4*i8x8, zigzag_scan8x8_cavlc+16*i4x4, | |
| 5008 h->dequant8_coeff[s->qscale], 16) <0 ) | |
| 5009 return -1; | |
| 5010 } | |
| 5011 if(s->qscale < 12){ | |
| 5012 int i; | |
| 5013 for(i=0; i<64; i++) | |
| 5014 buf[i] = (buf[i] + 2) >> 2; | |
| 5015 } | |
| 2757 | 5016 nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; |
| 2755 | 5017 nnz[0] |= nnz[1] | nnz[8] | nnz[9]; |
| 5018 }else{ | |
| 5019 for(i4x4=0; i4x4<4; i4x4++){ | |
| 5020 const int index= i4x4 + 4*i8x8; | |
| 1168 | 5021 |
| 2763 | 5022 if( decode_residual(h, gb, h->mb + 16*index, index, scan, h->dequant4_coeff[s->qscale], 16) <0 ){ |
| 2755 | 5023 return -1; |
| 5024 } | |
| 1168 | 5025 } |
| 5026 } | |
| 5027 }else{ | |
| 5028 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; | |
| 5029 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; | |
| 5030 } | |
| 5031 } | |
| 5032 } | |
| 5033 | |
| 5034 if(cbp&0x30){ | |
| 5035 for(chroma_idx=0; chroma_idx<2; chroma_idx++) | |
| 2763 | 5036 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, h->dequant4_coeff[chroma_qp], 4) < 0){ |
| 1168 | 5037 return -1; |
| 5038 } | |
| 5039 } | |
| 5040 | |
| 5041 if(cbp&0x20){ | |
| 5042 for(chroma_idx=0; chroma_idx<2; chroma_idx++){ | |
| 5043 for(i4x4=0; i4x4<4; i4x4++){ | |
| 5044 const int index= 16 + 4*chroma_idx + i4x4; | |
| 2763 | 5045 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[chroma_qp], 15) < 0){ |
| 1168 | 5046 return -1; |
| 5047 } | |
| 5048 } | |
| 5049 } | |
| 5050 }else{ | |
| 5051 uint8_t * const nnz= &h->non_zero_count_cache[0]; | |
| 5052 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
| 5053 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
| 5054 } | |
| 5055 }else{ | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5056 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
|
5057 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
|
5058 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
|
5059 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; |
| 1168 | 5060 } |
|
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
|
5061 s->current_picture.qscale_table[mb_xy]= s->qscale; |
| 1168 | 5062 write_back_non_zero_count(h); |
| 5063 | |
| 5064 return 0; | |
| 5065 } | |
| 5066 | |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5067 static int decode_cabac_field_decoding_flag(H264Context *h) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5068 MpegEncContext * const s = &h->s; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5069 const int mb_x = s->mb_x; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5070 const int mb_y = s->mb_y & ~1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5071 const int mba_xy = mb_x - 1 + mb_y *s->mb_stride; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5072 const int mbb_xy = mb_x + (mb_y-2)*s->mb_stride; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5073 |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5074 unsigned int ctx = 0; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5075 |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5076 if( h->slice_table[mba_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) ) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5077 ctx += 1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5078 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5079 if( h->slice_table[mbb_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) ) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5080 ctx += 1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5081 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5082 |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5083 return get_cabac( &h->cabac, &h->cabac_state[70 + ctx] ); |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5084 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5085 |
| 2312 | 5086 static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_slice) { |
| 5087 uint8_t *state= &h->cabac_state[ctx_base]; | |
| 5088 int mb_type; | |
| 5089 | |
| 5090 if(intra_slice){ | |
| 5091 MpegEncContext * const s = &h->s; | |
|
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5092 const int mba_xy = h->left_mb_xy[0]; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5093 const int mbb_xy = h->top_mb_xy; |
| 2312 | 5094 int ctx=0; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5095 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
|
5096 ctx++; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5097 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
|
5098 ctx++; |
| 2312 | 5099 if( get_cabac( &h->cabac, &state[ctx] ) == 0 ) |
| 5100 return 0; /* I4x4 */ | |
| 5101 state += 2; | |
| 5102 }else{ | |
| 5103 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
|
5104 return 0; /* I4x4 */ |
| 2312 | 5105 } |
| 5106 | |
| 5107 if( get_cabac_terminate( &h->cabac ) ) | |
| 5108 return 25; /* PCM */ | |
| 5109 | |
| 5110 mb_type = 1; /* I16x16 */ | |
| 5111 if( get_cabac( &h->cabac, &state[1] ) ) | |
| 5112 mb_type += 12; /* cbp_luma != 0 */ | |
| 5113 | |
| 5114 if( get_cabac( &h->cabac, &state[2] ) ) { | |
| 5115 if( get_cabac( &h->cabac, &state[2+intra_slice] ) ) | |
| 5116 mb_type += 4 * 2; /* cbp_chroma == 2 */ | |
| 5117 else | |
| 5118 mb_type += 4 * 1; /* cbp_chroma == 1 */ | |
| 5119 } | |
| 5120 if( get_cabac( &h->cabac, &state[3+intra_slice] ) ) | |
| 5121 mb_type += 2; | |
| 5122 if( get_cabac( &h->cabac, &state[3+2*intra_slice] ) ) | |
| 5123 mb_type += 1; | |
| 5124 return mb_type; | |
| 5125 } | |
| 5126 | |
| 5127 static int decode_cabac_mb_type( H264Context *h ) { | |
| 5128 MpegEncContext * const s = &h->s; | |
| 5129 | |
| 5130 if( h->slice_type == I_TYPE ) { | |
| 5131 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
|
5132 } 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
|
5133 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
|
5134 /* 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
|
5135 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
|
5136 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
|
5137 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
|
5138 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5139 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
|
5140 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5141 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
|
5142 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
|
5143 else |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5144 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
|
5145 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5146 } else { |
| 2312 | 5147 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
|
5148 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5149 } else if( h->slice_type == B_TYPE ) { |
|
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5150 const int mba_xy = h->left_mb_xy[0]; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5151 const int mbb_xy = h->top_mb_xy; |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5152 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
|
5153 int bits; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5154 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5155 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
|
5156 && !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
|
5157 ctx++; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5158 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
|
5159 && !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
|
5160 ctx++; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5161 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5162 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
|
5163 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
|
5164 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5165 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
|
5166 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
|
5167 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5168 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5169 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
|
5170 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
|
5171 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
|
5172 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
|
5173 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
|
5174 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
|
5175 else if( bits == 13 ) { |
| 2312 | 5176 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
|
5177 } 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
|
5178 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
|
5179 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
|
5180 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
|
5181 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5182 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
|
5183 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
|
5184 } else { |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5185 /* 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
|
5186 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
|
5187 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5188 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5189 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5190 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
|
5191 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
|
5192 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
|
5193 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
|
5194 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
|
5195 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
|
5196 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5197 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
|
5198 ctx++; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5199 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
|
5200 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5201 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5202 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
|
5203 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
|
5204 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
|
5205 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
|
5206 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5207 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5208 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
|
5209 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
|
5210 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5211 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
|
5212 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
|
5213 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5214 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
|
5215 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
|
5216 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
|
5217 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
|
5218 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
|
5219 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
|
5220 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
|
5221 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
|
5222 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5223 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
|
5224 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5225 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5226 static int decode_cabac_mb_chroma_pre_mode( H264Context *h) { |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5227 const int mba_xy = h->left_mb_xy[0]; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5228 const int mbb_xy = h->top_mb_xy; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5229 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5230 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
|
5231 |
|
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
|
5232 /* 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
|
5233 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
|
5234 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
|
5235 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5236 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
|
5237 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5238 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5239 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
|
5240 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
|
5241 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5242 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
|
5243 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
|
5244 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
|
5245 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
|
5246 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5247 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
|
5248 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5249 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5250 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
|
5251 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
|
5252 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5253 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
|
5254 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
|
5255 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5256 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
|
5257 { 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
|
5258 { 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
|
5259 { 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
|
5260 { 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
|
5261 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5262 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5263 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
|
5264 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
|
5265 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5266 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
|
5267 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
|
5268 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5269 for( i8x8 = 0; i8x8 < 4; i8x8++ ) { |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5270 int cbp_a = -1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5271 int cbp_b = -1; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5272 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
|
5273 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
|
5274 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5275 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
|
5276 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
|
5277 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5278 if( x > 0 ) |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5279 cbp_a = cbp; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5280 else if( s->mb_x > 0 && (h->slice_table[h->left_mb_xy[0]] == h->slice_num)) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5281 cbp_a = h->left_cbp; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5282 tprintf("cbp_a = left_cbp = %x\n", cbp_a); |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5283 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5284 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5285 if( y > 0 ) |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5286 cbp_b = cbp; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5287 else if( s->mb_y > 0 && (h->slice_table[h->top_mb_xy] == h->slice_num)) { |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5288 cbp_b = h->top_cbp; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5289 tprintf("cbp_b = top_cbp = %x\n", cbp_b); |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5290 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5291 |
|
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
|
5292 /* 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
|
5293 /* No need to test for IPCM as we put 1 for IPCM block */ |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5294 if( cbp_a >= 0 ) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5295 int i8x8a = block_idx_xy[(x-1)&0x03][y]/4; |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5296 if( ((cbp_a >> i8x8a)&0x01) == 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5297 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5298 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5299 |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5300 if( cbp_b >= 0 ) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5301 int i8x8b = block_idx_xy[x][(y-1)&0x03]/4; |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5302 if( ((cbp_b >> i8x8b)&0x01) == 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5303 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
|
5304 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5305 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5306 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
|
5307 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
|
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 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5310 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
|
5311 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5312 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
|
5313 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
|
5314 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
|
5315 |
| 2314 | 5316 cbp_a = (h->left_cbp>>4)&0x03; |
| 5317 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
|
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 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
|
5320 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
|
5321 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
|
5322 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
|
5323 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
|
5324 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5325 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
|
5326 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
|
5327 if( cbp_b == 2 ) ctx += 2; |
| 2314 | 5328 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
|
5329 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5330 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
|
5331 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
|
5332 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
|
5333 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
|
5334 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
|
5335 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5336 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
|
5337 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
|
5338 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5339 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
|
5340 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5341 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
|
5342 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5343 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5344 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
|
5345 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
|
5346 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
|
5347 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5348 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
|
5349 val++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5350 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5351 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5352 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
|
5353 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
|
5354 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5355 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
|
5356 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5357 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
|
5358 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
|
5359 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
|
5360 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
|
5361 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
|
5362 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
|
5363 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
|
5364 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
|
5365 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5366 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
|
5367 int type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5368 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
|
5369 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
|
5370 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
|
5371 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
|
5372 type = 3; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5373 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
|
5374 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
|
5375 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
|
5376 type += 4; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5377 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5378 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
|
5379 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
|
5380 return type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5381 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5382 |
| 2755 | 5383 static inline int decode_cabac_mb_transform_size( H264Context *h ) { |
| 5384 return get_cabac( &h->cabac, &h->cabac_state[399 + h->neighbor_transform_size] ); | |
| 5385 } | |
| 5386 | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5387 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
|
5388 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
|
5389 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
|
5390 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
|
5391 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
|
5392 |
| 2396 | 5393 if( h->slice_type == B_TYPE) { |
| 5394 if( refa > 0 && !h->direct_cache[scan8[n] - 1] ) | |
| 5395 ctx++; | |
| 5396 if( refb > 0 && !h->direct_cache[scan8[n] - 8] ) | |
| 5397 ctx += 2; | |
| 5398 } else { | |
| 5399 if( refa > 0 ) | |
| 5400 ctx++; | |
| 5401 if( refb > 0 ) | |
| 5402 ctx += 2; | |
| 5403 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5404 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5405 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
|
5406 ref++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5407 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
|
5408 ctx = 4; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5409 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5410 ctx = 5; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5411 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5412 return ref; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5413 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5414 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5415 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
|
5416 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
|
5417 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
|
5418 int ctxbase = (l == 0) ? 40 : 47; |
| 2317 | 5419 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
|
5420 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5421 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
|
5422 ctx = 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5423 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
|
5424 ctx = 2; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5425 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5426 ctx = 1; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5427 |
| 2317 | 5428 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx])) |
| 5429 return 0; | |
| 5430 | |
| 5431 mvd= 1; | |
| 5432 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
|
5433 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
|
5434 mvd++; |
| 2317 | 5435 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
|
5436 ctx++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5437 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5438 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5439 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
|
5440 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
|
5441 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
|
5442 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
|
5443 k++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5444 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5445 while( k-- ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5446 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
|
5447 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
|
5448 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5449 } |
| 2317 | 5450 if( get_cabac_bypass( &h->cabac ) ) return -mvd; |
| 5451 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
|
5452 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5453 |
| 2316 | 5454 static int inline get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { |
| 2314 | 5455 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
|
5456 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
|
5457 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5458 if( cat == 0 ) { |
| 2314 | 5459 nza = h->left_cbp&0x100; |
| 5460 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
|
5461 } else if( cat == 1 || cat == 2 ) { |
| 2314 | 5462 nza = h->non_zero_count_cache[scan8[idx] - 1]; |
| 5463 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
|
5464 } else if( cat == 3 ) { |
| 2314 | 5465 nza = (h->left_cbp>>(6+idx))&0x01; |
| 5466 nzb = (h-> top_cbp>>(6+idx))&0x01; | |
| 5467 } else { | |
| 5468 assert(cat == 4); | |
| 5469 nza = h->non_zero_count_cache[scan8[16+idx] - 1]; | |
| 5470 nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; | |
| 5471 } | |
| 5472 | |
| 5473 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
|
5474 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5475 |
| 2314 | 5476 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
|
5477 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
|
5478 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5479 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
|
5480 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5481 |
| 2755 | 5482 static int inline decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint16_t *qmul, int max_coeff) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5483 const int mb_xy = h->s.mb_x + h->s.mb_y*h->s.mb_stride; |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5484 static const int significant_coeff_flag_field_offset[2] = { 105, 277 }; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5485 static const int last_significant_coeff_flag_field_offset[2] = { 166, 338 }; |
| 2755 | 5486 static const int significant_coeff_flag_offset[6] = { 0, 15, 29, 44, 47, 297 }; |
| 5487 static const int last_significant_coeff_flag_offset[6] = { 0, 15, 29, 44, 47, 251 }; | |
| 5488 static const int coeff_abs_level_m1_offset[6] = { 227+0, 227+10, 227+20, 227+30, 227+39, 426 }; | |
| 5489 static const int identity[15] = { | |
| 5490 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 | |
| 5491 }; | |
| 5492 static const int significant_coeff_flag_offset_8x8[63] = { | |
| 5493 0, 1, 2, 3, 4, 5, 5, 4, 4, 3, 3, 4, 4, 4, 5, 5, | |
| 5494 4, 4, 4, 4, 3, 3, 6, 7, 7, 7, 8, 9,10, 9, 8, 7, | |
| 5495 7, 6,11,12,13,11, 6, 7, 8, 9,14,10, 9, 8, 6,11, | |
| 5496 12,13,11, 6, 9,14,10, 9,11,12,13,11,14,10,12 | |
| 5497 }; | |
| 5498 static const int last_coeff_flag_offset_8x8[63] = { | |
| 5499 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | |
| 5500 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | |
| 5501 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, | |
| 5502 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8 | |
| 5503 }; | |
| 5504 | |
| 5505 int index[64]; | |
| 2313 | 5506 |
| 5507 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
|
5508 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
|
5509 |
| 2316 | 5510 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
|
5511 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
|
5512 |
| 2755 | 5513 const int* significant_coeff_ctx_offset; |
| 5514 const int* last_coeff_ctx_offset; | |
| 5515 const int significant_coeff_ctx_base = significant_coeff_flag_offset[cat] | |
| 5516 + significant_coeff_flag_field_offset[h->mb_field_decoding_flag]; | |
| 5517 const int last_coeff_ctx_base = last_significant_coeff_flag_offset[cat] | |
| 5518 + last_significant_coeff_flag_field_offset[h->mb_field_decoding_flag]; | |
| 5519 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5520 /* 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
|
5521 * 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
|
5522 * 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
|
5523 * 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
|
5524 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx |
| 2755 | 5525 * 5-> Luma8x8 n = 4 * luma8x8idx |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5526 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5527 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5528 /* read coded block flag */ |
| 2755 | 5529 if( cat == 5 ) { |
| 5530 significant_coeff_ctx_offset = significant_coeff_flag_offset_8x8; | |
| 5531 last_coeff_ctx_offset = last_coeff_flag_offset_8x8; | |
| 5532 } else { | |
| 5533 if( get_cabac( &h->cabac, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n ) ] ) == 0 ) { | |
| 5534 if( cat == 1 || cat == 2 ) | |
| 5535 h->non_zero_count_cache[scan8[n]] = 0; | |
| 5536 else if( cat == 4 ) | |
| 5537 h->non_zero_count_cache[scan8[16+n]] = 0; | |
| 5538 | |
| 5539 return 0; | |
| 5540 } | |
| 5541 | |
| 5542 significant_coeff_ctx_offset = | |
| 5543 last_coeff_ctx_offset = identity; | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5544 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5545 |
| 2313 | 5546 for(last= 0; last < max_coeff - 1; last++) { |
| 2755 | 5547 int sig_ctx = significant_coeff_ctx_base + significant_coeff_ctx_offset[last]; |
| 5548 if( get_cabac( &h->cabac, &h->cabac_state[sig_ctx] )) { | |
| 5549 int last_ctx = last_coeff_ctx_base + last_coeff_ctx_offset[last]; | |
| 2313 | 5550 index[coeff_count++] = last; |
| 2755 | 5551 if( get_cabac( &h->cabac, &h->cabac_state[last_ctx] ) ) { |
| 2313 | 5552 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
|
5553 break; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5554 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5555 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5556 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5557 if( last == max_coeff -1 ) { |
| 2313 | 5558 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
|
5559 } |
| 2316 | 5560 assert(coeff_count > 0); |
| 5561 | |
| 5562 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
|
5563 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
|
5564 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
|
5565 h->non_zero_count_cache[scan8[n]] = coeff_count; |
| 2316 | 5566 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
|
5567 h->cbp_table[mb_xy] |= 0x40 << n; |
| 2755 | 5568 else if( cat == 4 ) |
| 5569 h->non_zero_count_cache[scan8[16+n]] = coeff_count; | |
| 2316 | 5570 else { |
| 2755 | 5571 assert( cat == 5 ); |
| 5572 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, 1, 1); | |
| 2316 | 5573 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5574 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5575 for( i = coeff_count - 1; i >= 0; i-- ) { |
| 2316 | 5576 int ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + coeff_abs_level_m1_offset[cat]; |
| 5577 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
|
5578 |
| 2313 | 5579 if( get_cabac( &h->cabac, &h->cabac_state[ctx] ) == 0 ) { |
| 2316 | 5580 if( cat == 0 || cat == 3 ) { |
| 5581 if( get_cabac_bypass( &h->cabac ) ) block[j] = -1; | |
| 5582 else block[j] = 1; | |
| 5583 }else{ | |
| 5584 if( get_cabac_bypass( &h->cabac ) ) block[j] = -qmul[j]; | |
| 5585 else block[j] = qmul[j]; | |
| 5586 } | |
| 2313 | 5587 |
| 5588 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
|
5589 } else { |
| 2313 | 5590 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
|
5591 ctx = 5 + FFMIN( 4, abslevelgt1 ) + coeff_abs_level_m1_offset[cat]; |
| 2313 | 5592 while( coeff_abs < 15 && get_cabac( &h->cabac, &h->cabac_state[ctx] ) ) { |
| 5593 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
|
5594 } |
| 2313 | 5595 |
| 5596 if( coeff_abs >= 15 ) { | |
| 5597 int j = 0; | |
| 5598 while( get_cabac_bypass( &h->cabac ) ) { | |
| 5599 coeff_abs += 1 << j; | |
| 5600 j++; | |
| 5601 } | |
| 5602 | |
| 5603 while( j-- ) { | |
| 5604 if( get_cabac_bypass( &h->cabac ) ) | |
| 5605 coeff_abs += 1 << j ; | |
| 5606 } | |
| 5607 } | |
| 5608 | |
| 2316 | 5609 if( cat == 0 || cat == 3 ) { |
| 5610 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs; | |
| 5611 else block[j] = coeff_abs; | |
| 5612 }else{ | |
| 5613 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs * qmul[j]; | |
| 5614 else block[j] = coeff_abs * qmul[j]; | |
| 5615 } | |
| 2313 | 5616 |
| 5617 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
|
5618 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5619 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5620 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
|
5621 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5622 |
|
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5623 void inline compute_mb_neighboors(H264Context *h) |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5624 { |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5625 MpegEncContext * const s = &h->s; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5626 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5627 h->top_mb_xy = mb_xy - s->mb_stride; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5628 h->left_mb_xy[0] = mb_xy - 1; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5629 if(h->mb_aff_frame){ |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5630 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5631 const int top_pair_xy = pair_xy - s->mb_stride; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5632 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]); |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5633 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]); |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5634 const int curr_mb_frame_flag = !h->mb_field_decoding_flag; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5635 const int bottom = (s->mb_y & 1); |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5636 if (bottom |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5637 ? !curr_mb_frame_flag // bottom macroblock |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5638 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5639 ) { |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5640 h->top_mb_xy -= s->mb_stride; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5641 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5642 if (left_mb_frame_flag != curr_mb_frame_flag) { |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5643 h->left_mb_xy[0] = pair_xy - 1; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5644 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5645 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5646 return; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5647 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5648 |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5649 /** |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5650 * 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
|
5651 * @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
|
5652 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5653 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
|
5654 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
|
5655 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
|
5656 int mb_type, partition_count, cbp = 0; |
| 2755 | 5657 int dct8x8_allowed= h->pps.transform_8x8_mode; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5658 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5659 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong?) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5660 |
|
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
|
5661 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
|
5662 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
|
5663 /* 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
|
5664 if( decode_cabac_mb_skip( h ) ) { |
| 2396 | 5665 decode_mb_skip(h); |
| 5666 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5667 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
|
5668 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
|
5669 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
|
5670 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5671 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
|
5672 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5673 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5674 } |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5675 if(h->mb_aff_frame){ |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
5676 if ( ((s->mb_y&1) == 0) || h->prev_mb_skipped) |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5677 h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h); |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5678 }else |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5679 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5680 |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
5681 h->prev_mb_skipped = 0; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5682 |
|
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5683 compute_mb_neighboors(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
|
5684 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
|
5685 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
|
5686 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
|
5687 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5688 |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5689 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
|
5690 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
|
5691 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
|
5692 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
|
5693 }else{ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5694 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
|
5695 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
|
5696 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5697 } 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
|
5698 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
|
5699 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
|
5700 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
|
5701 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5702 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
|
5703 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
|
5704 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5705 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5706 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
|
5707 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
|
5708 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
|
5709 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
|
5710 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
|
5711 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
|
5712 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5713 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
|
5714 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
|
5715 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5716 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
|
5717 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5718 if(IS_INTRA_PCM(mb_type)) { |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5719 const uint8_t *ptr; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5720 unsigned int x, y; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5721 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5722 // 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
|
5723 // 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
|
5724 // 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
|
5725 ptr= h->cabac.bytestream; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5726 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
|
5727 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5728 // 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
|
5729 for(y=0; y<16; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5730 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
|
5731 for(x=0; x<16; x++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5732 tprintf("LUMA ICPM LEVEL (%3d)\n", *ptr); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5733 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
|
5734 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5735 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5736 for(y=0; y<8; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5737 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
|
5738 for(x=0; x<8; x++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5739 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
|
5740 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
|
5741 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5742 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5743 for(y=0; y<8; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5744 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
|
5745 for(x=0; x<8; x++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5746 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
|
5747 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
|
5748 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5749 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5750 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5751 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
|
5752 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5753 // All blocks are present |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5754 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
|
5755 h->chroma_pred_mode_table[mb_xy] = 0; |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5756 // In deblocking, the quantizer is 0 |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5757 s->current_picture.qscale_table[mb_xy]= 0; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
5758 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, 0); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5759 // All coeffs are present |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5760 memset(h->non_zero_count[mb_xy], 16, 16); |
| 2755 | 5761 s->current_picture.mb_type[mb_xy]= mb_type; |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5762 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
|
5763 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5764 |
| 2449 | 5765 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
|
5766 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5767 if( IS_INTRA( mb_type ) ) { |
| 2755 | 5768 int i; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5769 if( IS_INTRA4x4( mb_type ) ) { |
| 2755 | 5770 if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) { |
| 5771 mb_type |= MB_TYPE_8x8DCT; | |
| 5772 for( i = 0; i < 16; i+=4 ) { | |
| 5773 int pred = pred_intra_mode( h, i ); | |
| 5774 int mode = decode_cabac_mb_intra4x4_pred_mode( h, pred ); | |
| 5775 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 ); | |
| 5776 } | |
| 5777 } else { | |
| 5778 for( i = 0; i < 16; i++ ) { | |
| 5779 int pred = pred_intra_mode( h, i ); | |
| 5780 h->intra4x4_pred_mode_cache[ scan8[i] ] = decode_cabac_mb_intra4x4_pred_mode( h, pred ); | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5781 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5782 //av_log( s->avctx, AV_LOG_ERROR, "i4x4 pred=%d mode=%d\n", pred, h->intra4x4_pred_mode_cache[ scan8[i] ] ); |
| 2755 | 5783 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5784 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5785 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
|
5786 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
|
5787 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5788 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
|
5789 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
|
5790 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5791 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
|
5792 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
|
5793 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5794 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
|
5795 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
|
5796 } 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
|
5797 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
|
5798 |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5799 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
|
5800 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
|
5801 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
|
5802 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
|
5803 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
|
5804 } |
| 2396 | 5805 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1]) |
| 5806 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) { | |
| 5807 pred_direct_motion(h, &mb_type); | |
| 5808 if( h->ref_count[0] > 1 || h->ref_count[1] > 1 ) { | |
| 5809 for( i = 0; i < 4; i++ ) | |
| 5810 if( IS_DIRECT(h->sub_mb_type[i]) ) | |
| 5811 fill_rectangle( &h->direct_cache[scan8[4*i]], 2, 2, 8, 1, 1 ); | |
| 5812 } | |
| 5813 } | |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5814 } else { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5815 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
|
5816 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
|
5817 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
|
5818 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
|
5819 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5820 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5821 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5822 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
|
5823 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
|
5824 for( i = 0; i < 4; i++ ) { |
| 2396 | 5825 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
| 5826 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
|
5827 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
|
5828 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
|
5829 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5830 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
|
5831 } else { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5832 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
|
5833 } |
| 2110 | 5834 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
|
5835 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
|
5836 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5837 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5838 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5839 |
| 2755 | 5840 if(dct8x8_allowed) |
| 5841 dct8x8_allowed = get_dct8x8_allowed(h); | |
| 5842 | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5843 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
|
5844 for(i=0; i<4; i++){ |
| 2396 | 5845 if(IS_DIRECT(h->sub_mb_type[i])){ |
| 5846 fill_rectangle(h->mvd_cache[list][scan8[4*i]], 2, 2, 8, 0, 4); | |
| 5847 continue; | |
| 5848 } | |
| 2110 | 5849 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
|
5850 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5851 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
|
5852 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
|
5853 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
|
5854 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
|
5855 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
|
5856 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
|
5857 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
|
5858 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
|
5859 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
|
5860 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
|
5861 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5862 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
|
5863 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
|
5864 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
|
5865 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5866 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
|
5867 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
|
5868 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
|
5869 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
|
5870 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
|
5871 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5872 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
|
5873 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
|
5874 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
|
5875 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
|
5876 }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
|
5877 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
|
5878 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
|
5879 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5880 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
|
5881 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
|
5882 }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
|
5883 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
|
5884 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
|
5885 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5886 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
|
5887 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
|
5888 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5889 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
|
5890 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
|
5891 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
|
5892 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5893 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
|
5894 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
|
5895 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5896 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5897 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5898 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
|
5899 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
|
5900 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
|
5901 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
|
5902 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5903 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5904 } |
| 2396 | 5905 } else if( IS_DIRECT(mb_type) ) { |
| 5906 pred_direct_motion(h, &mb_type); | |
| 5907 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 5908 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 2755 | 5909 dct8x8_allowed &= h->sps.direct_8x8_inference_flag; |
| 2396 | 5910 } else { |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5911 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
|
5912 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
|
5913 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
|
5914 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
|
5915 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
|
5916 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
|
5917 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
|
5918 } |
| 2523 | 5919 }else |
| 5920 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
|
5921 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5922 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
|
5923 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
|
5924 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
|
5925 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5926 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
|
5927 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
|
5928 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
|
5929 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5930 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
|
5931 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
| 2523 | 5932 }else |
| 5933 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
|
5934 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5935 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5936 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
|
5937 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
|
5938 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
|
5939 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
|
5940 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
|
5941 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
|
5942 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, ref, 1); |
| 2396 | 5943 }else |
| 5944 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
|
5945 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5946 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5947 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5948 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
|
5949 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
|
5950 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
|
5951 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
|
5952 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
|
5953 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
|
5954 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
|
5955 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5956 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
|
5957 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
| 2523 | 5958 }else{ |
| 2396 | 5959 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); |
| 5960 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
|
5961 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5962 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5963 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5964 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5965 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
|
5966 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
|
5967 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
|
5968 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
|
5969 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
|
5970 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
|
5971 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, ref, 1); |
| 2396 | 5972 }else |
| 5973 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
|
5974 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5975 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5976 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5977 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
|
5978 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
|
5979 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
|
5980 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
|
5981 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
|
5982 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
|
5983 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5984 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
|
5985 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
|
5986 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
| 2523 | 5987 }else{ |
| 2396 | 5988 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); |
| 5989 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
|
5990 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5991 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5992 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5993 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5994 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5995 |
|
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
|
5996 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
|
5997 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
|
5998 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
|
5999 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6000 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6001 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
|
6002 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
|
6003 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
|
6004 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6005 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6006 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
|
6007 |
| 2755 | 6008 if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) { |
| 6009 if( decode_cabac_mb_transform_size( h ) ) | |
| 6010 mb_type |= MB_TYPE_8x8DCT; | |
| 6011 } | |
| 6012 s->current_picture.mb_type[mb_xy]= mb_type; | |
| 6013 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6014 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
|
6015 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
|
6016 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
|
6017 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6018 if(IS_INTERLACED(mb_type)){ |
| 2763 | 6019 scan= s->qscale ? h->field_scan : h->field_scan_q0; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6020 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
|
6021 }else{ |
| 2763 | 6022 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6023 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
|
6024 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6025 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6026 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
|
6027 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
|
6028 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
|
6029 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
|
6030 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
|
6031 } |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6032 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale); |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6033 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6034 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
|
6035 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
|
6036 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" ); |
| 2763 | 6037 if( decode_cabac_residual( h, h->mb, 0, 0, dc_scan, h->dequant4_coeff[s->qscale], 16) < 0) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6038 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
|
6039 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
|
6040 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
|
6041 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i ); |
| 2763 | 6042 if( decode_cabac_residual(h, h->mb + 16*i, 1, i, scan + 1, h->dequant4_coeff[s->qscale], 15) < 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6043 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
|
6044 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6045 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6046 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
|
6047 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6048 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6049 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
|
6050 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
|
6051 if( cbp & (1<<i8x8) ) { |
| 2755 | 6052 if( IS_8x8DCT(mb_type) ) { |
| 6053 if( decode_cabac_residual(h, h->mb + 64*i8x8, 5, 4*i8x8, | |
| 6054 zigzag_scan8x8, h->dequant8_coeff[s->qscale], 64) < 0 ) | |
| 6055 return -1; | |
| 6056 if(s->qscale < 12){ | |
| 6057 int i; | |
| 6058 for(i=0; i<64; i++) | |
| 6059 h->mb[64*i8x8+i] = (h->mb[64*i8x8+i] + 2) >> 2; | |
| 6060 } | |
| 6061 } 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
|
6062 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
|
6063 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
|
6064 //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index ); |
| 2763 | 6065 if( decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, h->dequant4_coeff[s->qscale], 16) < 0 ) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6066 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
|
6067 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6068 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6069 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
|
6070 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
|
6071 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6072 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6073 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6074 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6075 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
|
6076 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
|
6077 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
|
6078 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c ); |
| 2763 | 6079 if( decode_cabac_residual(h, h->mb + 256 + 16*4*c, 3, c, chroma_dc_scan, h->dequant4_coeff[h->chroma_qp], 4) < 0) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6080 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
|
6081 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6082 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6083 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6084 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
|
6085 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
|
6086 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
|
6087 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
|
6088 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
|
6089 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 ); |
| 2763 | 6090 if( decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, h->dequant4_coeff[h->chroma_qp], 15) < 0) |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6091 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
|
6092 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6093 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6094 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6095 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
|
6096 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
|
6097 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
|
6098 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6099 } else { |
| 2315 | 6100 uint8_t * const nnz= &h->non_zero_count_cache[0]; |
| 6101 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1); | |
| 6102 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
| 6103 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
|
6104 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6105 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6106 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
|
6107 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
|
6108 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6109 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
|
6110 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6111 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6112 |
|
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
|
6113 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
|
6114 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
|
6115 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
|
6116 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
|
6117 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
|
6118 |
| 2633 | 6119 if( bS[0] < 4 ) { |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6120 int8_t tc[4]; |
| 2633 | 6121 for(i=0; i<4; i++) |
| 6122 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] : -1; | |
| 6123 h->s.dsp.h264_h_loop_filter_luma(pix, stride, alpha, beta, tc); | |
| 6124 } else { | |
| 6125 /* 16px edge length, because bS=4 is triggered by being at | |
| 6126 * the edge of an intra MB, so all 4 bS are the same */ | |
| 6127 for( d = 0; d < 16; d++ ) { | |
| 1898 | 6128 const int p0 = pix[-1]; |
| 6129 const int p1 = pix[-2]; | |
| 6130 const int p2 = pix[-3]; | |
| 6131 | |
| 6132 const int q0 = pix[0]; | |
| 6133 const int q1 = pix[1]; | |
| 6134 const int q2 = pix[2]; | |
| 6135 | |
| 6136 if( ABS( p0 - q0 ) < alpha && | |
| 6137 ABS( p1 - p0 ) < beta && | |
| 6138 ABS( q1 - q0 ) < beta ) { | |
| 6139 | |
| 6140 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
| 6141 if( ABS( p2 - p0 ) < beta) | |
| 6142 { | |
| 6143 const int p3 = pix[-4]; | |
| 6144 /* p0', p1', p2' */ | |
| 6145 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
| 6146 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
| 6147 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
| 6148 } else { | |
| 6149 /* p0' */ | |
| 6150 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6151 } | |
| 6152 if( ABS( q2 - q0 ) < beta) | |
| 6153 { | |
| 6154 const int q3 = pix[3]; | |
| 6155 /* q0', q1', q2' */ | |
| 6156 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
| 6157 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
| 6158 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
| 6159 } else { | |
| 6160 /* q0' */ | |
| 6161 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6162 } | |
| 6163 }else{ | |
| 6164 /* p0', q0' */ | |
| 6165 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6166 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6167 } | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6168 tprintf("filter_mb_edgev i:%d d:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, p2, p1, p0, q0, q1, q2, pix[-2], pix[-1], pix[0], pix[1]); |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6169 } |
| 1898 | 6170 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
|
6171 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6172 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6173 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6174 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
|
6175 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
|
6176 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
|
6177 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
|
6178 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
|
6179 |
| 2633 | 6180 if( bS[0] < 4 ) { |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6181 int8_t tc[4]; |
| 2633 | 6182 for(i=0; i<4; i++) |
| 6183 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] + 1 : 0; | |
| 6184 h->s.dsp.h264_h_loop_filter_chroma(pix, stride, alpha, beta, tc); | |
| 6185 } else { | |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6186 h->s.dsp.h264_h_loop_filter_chroma_intra(pix, stride, alpha, beta); |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6187 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6188 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6189 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6190 static void filter_mb_mbaff_edgev( H264Context *h, uint8_t *pix, int stride, int bS[8], int qp[2] ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6191 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6192 for( i = 0; i < 16; i++, pix += stride) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6193 int index_a; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6194 int alpha; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6195 int beta; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6196 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6197 int qp_index; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6198 int bS_index = (i >> 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6199 if (h->mb_field_decoding_flag) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6200 bS_index &= ~1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6201 bS_index |= (i & 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6202 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6203 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6204 if( bS[bS_index] == 0 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6205 continue; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6206 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6207 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6208 qp_index = h->mb_field_decoding_flag ? (i & 1) : (i >> 3); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6209 index_a = clip( qp[qp_index] + h->slice_alpha_c0_offset, 0, 51 ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6210 alpha = alpha_table[index_a]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6211 beta = beta_table[clip( qp[qp_index] + h->slice_beta_offset, 0, 51 )]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6212 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6213 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6214 if( bS[bS_index] < 4 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6215 const int tc0 = tc0_table[index_a][bS[bS_index] - 1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6216 /* 4px edge length */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6217 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6218 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6219 const int p2 = pix[-3]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6220 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6221 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6222 const int q2 = pix[2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6223 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6224 if( ABS( p0 - q0 ) < alpha && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6225 ABS( p1 - p0 ) < beta && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6226 ABS( q1 - q0 ) < beta ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6227 int tc = tc0; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6228 int i_delta; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6229 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6230 if( ABS( p2 - p0 ) < beta ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6231 pix[-2] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6232 tc++; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6233 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6234 if( ABS( q2 - q0 ) < beta ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6235 pix[1] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6236 tc++; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6237 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6238 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6239 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6240 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6241 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6242 tprintf("filter_mb_mbaff_edgev i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6243 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6244 }else{ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6245 /* 4px edge length */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6246 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6247 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6248 const int p2 = pix[-3]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6249 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6250 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6251 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6252 const int q2 = pix[2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6253 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6254 if( ABS( p0 - q0 ) < alpha && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6255 ABS( p1 - p0 ) < beta && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6256 ABS( q1 - q0 ) < beta ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6257 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6258 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6259 if( ABS( p2 - p0 ) < beta) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6260 { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6261 const int p3 = pix[-4]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6262 /* p0', p1', p2' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6263 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6264 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6265 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6266 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6267 /* p0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6268 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6269 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6270 if( ABS( q2 - q0 ) < beta) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6271 { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6272 const int q3 = pix[3]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6273 /* q0', q1', q2' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6274 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6275 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6276 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6277 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6278 /* q0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6279 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6280 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6281 }else{ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6282 /* p0', q0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6283 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6284 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6285 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6286 tprintf("filter_mb_mbaff_edgev i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, p2, p1, p0, q0, q1, q2, pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6287 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6288 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6289 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6290 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6291 static void filter_mb_mbaff_edgecv( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp[2] ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6292 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6293 for( i = 0; i < 8; i++, pix += stride) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6294 int index_a; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6295 int alpha; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6296 int beta; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6297 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6298 int qp_index; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6299 int bS_index = i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6300 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6301 if( bS[bS_index] == 0 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6302 continue; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6303 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6304 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6305 qp_index = h->mb_field_decoding_flag ? (i & 1) : (i >> 3); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6306 index_a = clip( qp[qp_index] + h->slice_alpha_c0_offset, 0, 51 ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6307 alpha = alpha_table[index_a]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6308 beta = beta_table[clip( qp[qp_index] + h->slice_beta_offset, 0, 51 )]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6309 if( bS[bS_index] < 4 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6310 const int tc = tc0_table[index_a][bS[bS_index] - 1] + 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6311 /* 2px edge length (because we use same bS than the one for luma) */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6312 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6313 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6314 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6315 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6316 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6317 if( ABS( p0 - q0 ) < alpha && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6318 ABS( p1 - p0 ) < beta && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6319 ABS( q1 - q0 ) < beta ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6320 const int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6321 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6322 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6323 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6324 tprintf("filter_mb_mbaff_edgecv i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6325 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6326 }else{ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6327 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6328 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6329 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6330 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6331 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6332 if( ABS( p0 - q0 ) < alpha && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6333 ABS( p1 - p0 ) < beta && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6334 ABS( q1 - q0 ) < beta ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6335 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6336 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6337 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6338 tprintf("filter_mb_mbaff_edgecv i:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, pix[-3], p1, p0, q0, q1, pix[2], pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6339 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6340 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6341 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6342 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6343 |
|
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
|
6344 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
|
6345 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
|
6346 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
|
6347 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
|
6348 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
|
6349 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
|
6350 |
| 2633 | 6351 if( bS[0] < 4 ) { |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6352 int8_t tc[4]; |
| 2633 | 6353 for(i=0; i<4; i++) |
| 6354 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] : -1; | |
| 6355 h->s.dsp.h264_v_loop_filter_luma(pix, stride, alpha, beta, tc); | |
| 6356 } else { | |
| 6357 /* 16px edge length, see filter_mb_edgev */ | |
| 6358 for( d = 0; d < 16; d++ ) { | |
| 1898 | 6359 const int p0 = pix[-1*pix_next]; |
| 6360 const int p1 = pix[-2*pix_next]; | |
| 6361 const int p2 = pix[-3*pix_next]; | |
| 6362 const int q0 = pix[0]; | |
| 6363 const int q1 = pix[1*pix_next]; | |
| 6364 const int q2 = pix[2*pix_next]; | |
| 6365 | |
| 6366 if( ABS( p0 - q0 ) < alpha && | |
| 6367 ABS( p1 - p0 ) < beta && | |
| 6368 ABS( q1 - q0 ) < beta ) { | |
| 6369 | |
| 6370 const int p3 = pix[-4*pix_next]; | |
| 6371 const int q3 = pix[ 3*pix_next]; | |
| 6372 | |
| 6373 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
| 6374 if( ABS( p2 - p0 ) < beta) { | |
| 6375 /* p0', p1', p2' */ | |
| 6376 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
| 6377 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
| 6378 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
| 6379 } else { | |
| 6380 /* p0' */ | |
| 6381 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6382 } | |
| 6383 if( ABS( q2 - q0 ) < beta) { | |
| 6384 /* q0', q1', q2' */ | |
| 6385 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
| 6386 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
| 6387 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
| 6388 } else { | |
| 6389 /* q0' */ | |
| 6390 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6391 } | |
| 6392 }else{ | |
| 6393 /* p0', q0' */ | |
| 6394 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6395 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6396 } | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6397 tprintf("filter_mb_edgeh i:%d d:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, qp, index_a, alpha, beta, bS[i], p2, p1, p0, q0, q1, q2, pix[-2*pix_next], pix[-pix_next], pix[0], pix[pix_next]); |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6398 } |
| 1898 | 6399 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
|
6400 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6401 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6402 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6403 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6404 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
|
6405 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
|
6406 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
|
6407 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
|
6408 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
|
6409 |
| 2633 | 6410 if( bS[0] < 4 ) { |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6411 int8_t tc[4]; |
| 2633 | 6412 for(i=0; i<4; i++) |
| 6413 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] + 1 : 0; | |
| 6414 h->s.dsp.h264_v_loop_filter_chroma(pix, stride, alpha, beta, tc); | |
| 6415 } else { | |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6416 h->s.dsp.h264_v_loop_filter_chroma_intra(pix, stride, alpha, beta); |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6417 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6418 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6419 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6420 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize) { |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6421 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
|
6422 const int mb_xy= mb_x + mb_y*s->mb_stride; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6423 int first_vertical_edge_done = 0; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6424 int dir; |
|
2629
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
6425 /* FIXME: A given frame may occupy more than one position in |
|
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
6426 * the reference list. So ref2frm should be populated with |
|
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
6427 * frame numbers, not indices. */ |
|
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
6428 static const int ref2frm[18] = {-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}; |
|
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
|
6429 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6430 if (h->mb_aff_frame |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6431 // left mb is in picture |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6432 && h->slice_table[mb_xy-1] != 255 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6433 // and current and left pair do not have the same interlaced type |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6434 && (IS_INTERLACED(s->current_picture.mb_type[mb_xy]) != IS_INTERLACED(s->current_picture.mb_type[mb_xy-1])) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6435 // and left mb is in the same slice if deblocking_filter == 2 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6436 && (h->deblocking_filter!=2 || h->slice_table[mb_xy-1] == h->slice_table[mb_xy])) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6437 /* First vertical edge is different in MBAFF frames |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6438 * There are 8 different bS to compute and 2 different Qp |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6439 */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6440 int bS[8]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6441 int qp[2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6442 int chroma_qp[2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6443 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6444 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6445 first_vertical_edge_done = 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6446 for( i = 0; i < 8; i++ ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6447 int y = i>>1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6448 int b_idx= 8 + 4 + 8*y; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6449 int bn_idx= b_idx - 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6450 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6451 int mbn_xy = h->mb_field_decoding_flag ? h->left_mb_xy[i>>2] : h->left_mb_xy[i&1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6452 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6453 if( IS_INTRA( s->current_picture.mb_type[mb_xy] ) || |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6454 IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6455 bS[i] = 4; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6456 } else if( h->non_zero_count_cache[b_idx] != 0 || |
| 2755 | 6457 /* FIXME: with 8x8dct + cavlc, should check cbp instead of nnz */ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6458 h->non_zero_count_cache[bn_idx] != 0 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6459 bS[i] = 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6460 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6461 int l; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6462 bS[i] = 0; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6463 for( l = 0; l < 1 + (h->slice_type == B_TYPE); l++ ) { |
|
2629
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
6464 if( ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] || |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6465 ABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6466 ABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= 4 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6467 bS[i] = 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6468 break; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6469 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6470 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6471 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6472 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6473 if(bS[0]+bS[1]+bS[2]+bS[3] != 0) { |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6474 // Do not use s->qscale as luma quantizer because it has not the same |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6475 // value in IPCM macroblocks. |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6476 qp[0] = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[h->left_mb_xy[0]] + 1 ) >> 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6477 chroma_qp[0] = ( get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mb_xy] ) + |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6478 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[h->left_mb_xy[0]] ) + 1 ) >> 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6479 qp[1] = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[h->left_mb_xy[1]] + 1 ) >> 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6480 chroma_qp[1] = ( get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mb_xy] ) + |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6481 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[h->left_mb_xy[1]] ) + 1 ) >> 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6482 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6483 /* Filter edge */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6484 tprintf("filter mb:%d/%d MBAFF, QPy:%d/%d, QPc:%d/%d ls:%d uvls:%d", mb_x, mb_y, qp[0], qp[1], chroma_qp[0], chroma_qp[1], linesize, uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6485 { int i; for (i = 0; i < 8; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6486 filter_mb_mbaff_edgev ( h, &img_y [0], linesize, bS, qp ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6487 filter_mb_mbaff_edgecv( h, &img_cb[0], uvlinesize, bS, chroma_qp ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6488 filter_mb_mbaff_edgecv( h, &img_cr[0], uvlinesize, bS, chroma_qp ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6489 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6490 } |
|
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
|
6491 /* 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
|
6492 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
|
6493 { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6494 int edge; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6495 const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy; |
| 2454 | 6496 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0; |
| 6497 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6498 if (first_vertical_edge_done) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6499 start = 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6500 first_vertical_edge_done = 0; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6501 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6502 |
| 2454 | 6503 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
|
6504 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
|
6505 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6506 /* 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
|
6507 for( edge = start; edge < 4; edge++ ) { |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6508 /* mbn_xy: neighbor macroblock */ |
| 2454 | 6509 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
|
6510 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
|
6511 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
|
6512 |
| 2755 | 6513 if( (edge&1) && IS_8x8DCT(s->current_picture.mb_type[mb_xy]) ) |
| 6514 continue; | |
| 6515 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6516 if (h->mb_aff_frame && (dir == 1) && (edge == 0) && ((mb_y & 1) == 0) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6517 && !IS_INTERLACED(s->current_picture.mb_type[mb_xy]) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6518 && IS_INTERLACED(s->current_picture.mb_type[mbn_xy]) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6519 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6520 // This is a special case in the norm where the filtering must |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6521 // be done twice (one each of the field) even if we are in a |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6522 // frame macroblock. |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6523 // |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6524 unsigned int tmp_linesize = 2 * linesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6525 unsigned int tmp_uvlinesize = 2 * uvlinesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6526 int mbn_xy = mb_xy - 2 * s->mb_stride; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6527 int qp, chroma_qp; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6528 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6529 // first filtering |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6530 if( IS_INTRA( s->current_picture.mb_type[mb_xy] ) || |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6531 IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6532 bS[0] = bS[1] = bS[2] = bS[3] = 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6533 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6534 // TODO |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6535 assert(0); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6536 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6537 /* Filter edge */ |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6538 // Do not use s->qscale as luma quantizer because it has not the same |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6539 // value in IPCM macroblocks. |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6540 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6541 tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6542 { int i; for (i = 0; i < 4; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6543 filter_mb_edgeh( h, &img_y[0], tmp_linesize, bS, qp ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6544 chroma_qp = ( h->chroma_qp + |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6545 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6546 filter_mb_edgech( h, &img_cb[0], tmp_uvlinesize, bS, chroma_qp ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6547 filter_mb_edgech( h, &img_cr[0], tmp_uvlinesize, bS, chroma_qp ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6548 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6549 // second filtering |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6550 mbn_xy += s->mb_stride; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6551 if( IS_INTRA( s->current_picture.mb_type[mb_xy] ) || |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6552 IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6553 bS[0] = bS[1] = bS[2] = bS[3] = 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6554 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6555 // TODO |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6556 assert(0); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6557 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6558 /* Filter edge */ |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6559 // Do not use s->qscale as luma quantizer because it has not the same |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6560 // value in IPCM macroblocks. |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6561 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6562 tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6563 { int i; for (i = 0; i < 4; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6564 filter_mb_edgeh( h, &img_y[linesize], tmp_linesize, bS, qp ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6565 chroma_qp = ( h->chroma_qp + |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6566 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6567 filter_mb_edgech( h, &img_cb[uvlinesize], tmp_uvlinesize, bS, chroma_qp ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6568 filter_mb_edgech( h, &img_cr[uvlinesize], tmp_uvlinesize, bS, chroma_qp ); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6569 continue; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6570 } |
|
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
|
6571 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
|
6572 IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) { |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6573 int value; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6574 if (edge == 0) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6575 if ( (!IS_INTERLACED(s->current_picture.mb_type[mb_xy]) && !IS_INTERLACED(s->current_picture.mb_type[mbm_xy])) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6576 || ((h->mb_aff_frame || (s->picture_structure != PICT_FRAME)) && (dir == 0)) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6577 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6578 value = 4; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6579 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6580 value = 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6581 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6582 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6583 value = 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6584 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6585 bS[0] = bS[1] = bS[2] = bS[3] = value; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6586 } 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
|
6587 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
|
6588 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
|
6589 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
|
6590 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
|
6591 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
|
6592 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
|
6593 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
6594 if( h->non_zero_count_cache[b_idx] != 0 || |
| 2449 | 6595 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
|
6596 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
|
6597 } |
| 2523 | 6598 else |
| 6599 { | |
| 6600 int l; | |
| 6601 bS[i] = 0; | |
| 6602 for( l = 0; l < 1 + (h->slice_type == B_TYPE); l++ ) { | |
|
2629
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
6603 if( ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] || |
| 2523 | 6604 ABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || |
| 6605 ABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= 4 ) { | |
| 6606 bS[i] = 1; | |
| 6607 break; | |
| 6608 } | |
| 6609 } | |
|
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
|
6610 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6611 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
6612 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
6613 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
|
6614 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
|
6615 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6616 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6617 /* Filter edge */ |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6618 // Do not use s->qscale as luma quantizer because it has not the same |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6619 // value in IPCM macroblocks. |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6620 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
|
6621 //tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d, QPc:%d, QPcn:%d\n", mb_x, mb_y, dir, edge, qp, h->chroma_qp, s->current_picture.qscale_table[mbn_xy]); |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6622 tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6623 { int i; for (i = 0; i < 4; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); } |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6624 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
|
6625 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp ); |
| 1898 | 6626 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
|
6627 int chroma_qp = ( h->chroma_qp + |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6628 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6629 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
|
6630 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
|
6631 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6632 } 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
|
6633 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp ); |
| 1898 | 6634 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
|
6635 int chroma_qp = ( h->chroma_qp + |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6636 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1; |
|
1897
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6637 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
|
6638 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
|
6639 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6640 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6641 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6642 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6643 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6644 |
| 1168 | 6645 static int decode_slice(H264Context *h){ |
| 6646 MpegEncContext * const s = &h->s; | |
| 6647 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; | |
| 6648 | |
| 6649 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
|
6650 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6651 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
|
6652 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
|
6653 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6654 /* realign */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6655 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
|
6656 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6657 /* 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
|
6658 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
|
6659 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
|
6660 s->gb.buffer + get_bits_count(&s->gb)/8, |
| 2116 | 6661 ( 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
|
6662 /* calculate pre-state */ |
| 2755 | 6663 for( i= 0; i < 460; i++ ) { |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6664 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
|
6665 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
|
6666 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
|
6667 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6668 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
|
6669 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6670 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
|
6671 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
|
6672 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6673 h->cabac_state[i] = 2 * ( pre - 64 ) + 1; |
| 1168 | 6674 } |
| 6675 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6676 for(;;){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6677 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
|
6678 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
|
6679 |
| 2163 | 6680 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
|
6681 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6682 /* XXX: useless as decode_mb_cabac it doesn't support that ... */ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6683 if( ret >= 0 && h->mb_aff_frame ) { //FIXME optimal? or let mb_decode decode 16x32 ? |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6684 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
|
6685 |
| 2163 | 6686 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
|
6687 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6688 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
|
6689 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
|
6690 } |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6691 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
|
6692 |
| 2116 | 6693 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
|
6694 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
|
6695 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
|
6696 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
|
6697 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6698 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6699 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
|
6700 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
|
6701 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
| 2392 | 6702 ++s->mb_y; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6703 if(h->mb_aff_frame) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6704 ++s->mb_y; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6705 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6706 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6707 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6708 if( eos || s->mb_y >= s->mb_height ) { |
| 2392 | 6709 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
|
6710 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
|
6711 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
|
6712 } |
| 1168 | 6713 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6714 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6715 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6716 for(;;){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6717 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
|
6718 |
| 2163 | 6719 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
|
6720 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6721 if(ret>=0 && h->mb_aff_frame){ //FIXME optimal? or let mb_decode decode 16x32 ? |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6722 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
|
6723 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
|
6724 |
| 2163 | 6725 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
|
6726 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
|
6727 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6728 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6729 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
|
6730 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
|
6731 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
|
6732 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6733 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
|
6734 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6735 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6736 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
|
6737 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
|
6738 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
|
6739 ++s->mb_y; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6740 if(h->mb_aff_frame) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6741 ++s->mb_y; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6742 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6743 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
|
6744 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
|
6745 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6746 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
|
6747 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
|
6748 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6749 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
|
6750 }else{ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6751 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
|
6752 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6753 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
|
6754 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6755 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6756 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6757 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6758 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){ |
| 2392 | 6759 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
|
6760 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){ |
| 1168 | 6761 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); |
| 6762 | |
| 6763 return 0; | |
| 6764 }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
|
6765 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 | 6766 |
| 6767 return -1; | |
| 6768 } | |
| 6769 } | |
| 6770 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6771 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6772 |
| 1168 | 6773 #if 0 |
| 6774 for(;s->mb_y < s->mb_height; s->mb_y++){ | |
| 6775 for(;s->mb_x < s->mb_width; s->mb_x++){ | |
| 6776 int ret= decode_mb(h); | |
| 6777 | |
| 6778 hl_decode_mb(h); | |
| 6779 | |
| 6780 if(ret<0){ | |
| 6781 fprintf(stderr, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); | |
| 6782 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); | |
| 6783 | |
| 6784 return -1; | |
| 6785 } | |
| 6786 | |
| 6787 if(++s->mb_x >= s->mb_width){ | |
| 6788 s->mb_x=0; | |
| 6789 if(++s->mb_y >= s->mb_height){ | |
| 6790 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
| 6791 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); | |
| 6792 | |
| 6793 return 0; | |
| 6794 }else{ | |
| 6795 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); | |
| 6796 | |
| 6797 return -1; | |
| 6798 } | |
| 6799 } | |
| 6800 } | |
| 6801 | |
| 6802 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){ | |
| 6803 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
| 6804 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); | |
| 6805 | |
| 6806 return 0; | |
| 6807 }else{ | |
| 6808 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); | |
| 6809 | |
| 6810 return -1; | |
| 6811 } | |
| 6812 } | |
| 6813 } | |
| 6814 s->mb_x=0; | |
| 6815 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
| 6816 } | |
| 6817 #endif | |
| 6818 return -1; //not reached | |
| 6819 } | |
| 6820 | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6821 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
|
6822 MpegEncContext * const s = &h->s; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6823 int cpb_count, i; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6824 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
|
6825 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
|
6826 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
|
6827 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
|
6828 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
|
6829 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
|
6830 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
|
6831 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6832 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
|
6833 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
|
6834 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
|
6835 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
|
6836 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6837 |
| 1168 | 6838 static inline int decode_vui_parameters(H264Context *h, SPS *sps){ |
| 6839 MpegEncContext * const s = &h->s; | |
| 6840 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
|
6841 int nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag; |
| 1168 | 6842 |
| 6843 aspect_ratio_info_present_flag= get_bits1(&s->gb); | |
| 6844 | |
| 6845 if( aspect_ratio_info_present_flag ) { | |
| 6846 aspect_ratio_idc= get_bits(&s->gb, 8); | |
| 6847 if( aspect_ratio_idc == EXTENDED_SAR ) { | |
| 1548 | 6848 sps->sar.num= get_bits(&s->gb, 16); |
| 6849 sps->sar.den= get_bits(&s->gb, 16); | |
| 1168 | 6850 }else if(aspect_ratio_idc < 16){ |
| 1548 | 6851 sps->sar= pixel_aspect[aspect_ratio_idc]; |
| 1168 | 6852 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
6853 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n"); |
| 1168 | 6854 return -1; |
| 6855 } | |
| 6856 }else{ | |
| 1548 | 6857 sps->sar.num= |
| 6858 sps->sar.den= 0; | |
| 1168 | 6859 } |
| 6860 // 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
|
6861 |
|
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
|
6862 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
|
6863 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
|
6864 } |
|
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
|
6865 |
|
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
|
6866 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
|
6867 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
|
6868 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
|
6869 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
|
6870 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
|
6871 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
|
6872 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
|
6873 } |
|
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
|
6874 } |
|
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
|
6875 |
|
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
|
6876 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
|
6877 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
|
6878 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
|
6879 } |
|
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
|
6880 |
|
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
|
6881 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
|
6882 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
|
6883 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
|
6884 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
|
6885 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
|
6886 } |
|
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
|
6887 |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6888 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
|
6889 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
|
6890 decode_hrd_parameters(h, sps); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6891 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
|
6892 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
|
6893 decode_hrd_parameters(h, sps); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6894 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
|
6895 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
|
6896 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
|
6897 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6898 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
|
6899 if(sps->bitstream_restriction_flag){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6900 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
|
6901 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
|
6902 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
|
6903 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
|
6904 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
|
6905 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
|
6906 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
|
6907 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6908 |
| 1168 | 6909 return 0; |
| 6910 } | |
| 6911 | |
| 6912 static inline int decode_seq_parameter_set(H264Context *h){ | |
| 6913 MpegEncContext * const s = &h->s; | |
| 1371 | 6914 int profile_idc, level_idc; |
| 1168 | 6915 int sps_id, i; |
| 6916 SPS *sps; | |
| 6917 | |
| 6918 profile_idc= get_bits(&s->gb, 8); | |
| 1371 | 6919 get_bits1(&s->gb); //constraint_set0_flag |
| 6920 get_bits1(&s->gb); //constraint_set1_flag | |
| 6921 get_bits1(&s->gb); //constraint_set2_flag | |
| 2312 | 6922 get_bits1(&s->gb); //constraint_set3_flag |
| 6923 get_bits(&s->gb, 4); // reserved | |
| 1168 | 6924 level_idc= get_bits(&s->gb, 8); |
| 6925 sps_id= get_ue_golomb(&s->gb); | |
| 6926 | |
| 6927 sps= &h->sps_buffer[ sps_id ]; | |
| 6928 sps->profile_idc= profile_idc; | |
| 6929 sps->level_idc= level_idc; | |
| 2312 | 6930 |
| 2755 | 6931 if(sps->profile_idc >= 100){ //high profile |
| 6932 if(get_ue_golomb(&s->gb) == 3) //chroma_format_idc | |
| 6933 get_bits1(&s->gb); //residual_color_transform_flag | |
| 6934 get_ue_golomb(&s->gb); //bit_depth_luma_minus8 | |
| 6935 get_ue_golomb(&s->gb); //bit_depth_chroma_minus8 | |
| 2763 | 6936 sps->transform_bypass = get_bits1(&s->gb); |
| 2755 | 6937 if(get_bits1(&s->gb)){ //seq_scaling_matrix_present_flag |
| 6938 av_log(h->s.avctx, AV_LOG_ERROR, "custom scaling matrix not implemented\n"); | |
| 6939 return -1; | |
| 6940 } | |
| 6941 } | |
| 6942 | |
| 1168 | 6943 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4; |
| 6944 sps->poc_type= get_ue_golomb(&s->gb); | |
| 6945 | |
| 6946 if(sps->poc_type == 0){ //FIXME #define | |
| 6947 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4; | |
| 6948 } else if(sps->poc_type == 1){//FIXME #define | |
| 6949 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb); | |
| 6950 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb); | |
| 6951 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb); | |
| 6952 sps->poc_cycle_length= get_ue_golomb(&s->gb); | |
| 6953 | |
| 6954 for(i=0; i<sps->poc_cycle_length; i++) | |
| 6955 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb); | |
| 6956 } | |
| 6957 if(sps->poc_type > 2){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
6958 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type); |
| 1168 | 6959 return -1; |
| 6960 } | |
| 6961 | |
| 6962 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
|
6963 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
|
6964 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
|
6965 } |
| 1371 | 6966 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb); |
| 1168 | 6967 sps->mb_width= get_ue_golomb(&s->gb) + 1; |
| 6968 sps->mb_height= get_ue_golomb(&s->gb) + 1; | |
| 2422 | 6969 if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 || |
| 6970 avcodec_check_dimensions(NULL, 16*sps->mb_width, 16*sps->mb_height)) | |
| 6971 return -1; | |
| 6972 | |
| 1168 | 6973 sps->frame_mbs_only_flag= get_bits1(&s->gb); |
| 6974 if(!sps->frame_mbs_only_flag) | |
| 6975 sps->mb_aff= get_bits1(&s->gb); | |
| 6976 else | |
| 6977 sps->mb_aff= 0; | |
| 6978 | |
| 6979 sps->direct_8x8_inference_flag= get_bits1(&s->gb); | |
| 6980 | |
| 1371 | 6981 sps->crop= get_bits1(&s->gb); |
| 6982 if(sps->crop){ | |
| 6983 sps->crop_left = get_ue_golomb(&s->gb); | |
| 6984 sps->crop_right = get_ue_golomb(&s->gb); | |
| 6985 sps->crop_top = get_ue_golomb(&s->gb); | |
| 6986 sps->crop_bottom= get_ue_golomb(&s->gb); | |
| 6987 if(sps->crop_left || sps->crop_top){ | |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
6988 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n"); |
| 1371 | 6989 } |
| 6990 }else{ | |
| 6991 sps->crop_left = | |
| 6992 sps->crop_right = | |
| 6993 sps->crop_top = | |
| 6994 sps->crop_bottom= 0; | |
| 6995 } | |
| 6996 | |
| 1168 | 6997 sps->vui_parameters_present_flag= get_bits1(&s->gb); |
| 6998 if( sps->vui_parameters_present_flag ) | |
| 6999 decode_vui_parameters(h, sps); | |
| 7000 | |
| 7001 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
|
7002 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 | 7003 sps_id, sps->profile_idc, sps->level_idc, |
| 7004 sps->poc_type, | |
| 7005 sps->ref_frame_count, | |
| 7006 sps->mb_width, sps->mb_height, | |
| 7007 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"), | |
| 7008 sps->direct_8x8_inference_flag ? "8B8" : "", | |
| 1371 | 7009 sps->crop_left, sps->crop_right, |
| 7010 sps->crop_top, sps->crop_bottom, | |
| 1168 | 7011 sps->vui_parameters_present_flag ? "VUI" : "" |
| 7012 ); | |
| 7013 } | |
| 7014 return 0; | |
| 7015 } | |
| 7016 | |
| 2755 | 7017 static inline int decode_picture_parameter_set(H264Context *h, int bit_length){ |
| 1168 | 7018 MpegEncContext * const s = &h->s; |
| 7019 int pps_id= get_ue_golomb(&s->gb); | |
| 7020 PPS *pps= &h->pps_buffer[pps_id]; | |
| 7021 | |
| 7022 pps->sps_id= get_ue_golomb(&s->gb); | |
| 7023 pps->cabac= get_bits1(&s->gb); | |
| 7024 pps->pic_order_present= get_bits1(&s->gb); | |
| 7025 pps->slice_group_count= get_ue_golomb(&s->gb) + 1; | |
| 7026 if(pps->slice_group_count > 1 ){ | |
| 7027 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
|
7028 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n"); |
| 1168 | 7029 switch(pps->mb_slice_group_map_type){ |
| 7030 case 0: | |
| 7031 #if 0 | |
| 7032 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | | | |
| 7033 | run_length[ i ] |1 |ue(v) | | |
| 7034 #endif | |
| 7035 break; | |
| 7036 case 2: | |
| 7037 #if 0 | |
| 7038 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | | | |
| 7039 |{ | | | | |
| 7040 | top_left_mb[ i ] |1 |ue(v) | | |
| 7041 | bottom_right_mb[ i ] |1 |ue(v) | | |
| 7042 | } | | | | |
| 7043 #endif | |
| 7044 break; | |
| 7045 case 3: | |
| 7046 case 4: | |
| 7047 case 5: | |
| 7048 #if 0 | |
| 7049 | slice_group_change_direction_flag |1 |u(1) | | |
| 7050 | slice_group_change_rate_minus1 |1 |ue(v) | | |
| 7051 #endif | |
| 7052 break; | |
| 7053 case 6: | |
| 7054 #if 0 | |
| 7055 | slice_group_id_cnt_minus1 |1 |ue(v) | | |
| 7056 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | | | |
| 7057 |) | | | | |
| 7058 | slice_group_id[ i ] |1 |u(v) | | |
| 7059 #endif | |
| 1214 | 7060 break; |
| 1168 | 7061 } |
| 7062 } | |
| 7063 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
| 7064 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
| 7065 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
|
7066 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n"); |
| 1168 | 7067 return -1; |
| 7068 } | |
| 7069 | |
| 7070 pps->weighted_pred= get_bits1(&s->gb); | |
| 7071 pps->weighted_bipred_idc= get_bits(&s->gb, 2); | |
| 7072 pps->init_qp= get_se_golomb(&s->gb) + 26; | |
| 7073 pps->init_qs= get_se_golomb(&s->gb) + 26; | |
| 7074 pps->chroma_qp_index_offset= get_se_golomb(&s->gb); | |
| 7075 pps->deblocking_filter_parameters_present= get_bits1(&s->gb); | |
| 7076 pps->constrained_intra_pred= get_bits1(&s->gb); | |
| 7077 pps->redundant_pic_cnt_present = get_bits1(&s->gb); | |
| 2755 | 7078 |
| 7079 if(get_bits_count(&s->gb) < bit_length){ | |
| 7080 pps->transform_8x8_mode= get_bits1(&s->gb); | |
| 7081 if(get_bits1(&s->gb)){ //pic_scaling_matrix_present_flag | |
| 7082 av_log(h->s.avctx, AV_LOG_ERROR, "custom scaling matrix not implemented\n"); | |
| 7083 return -1; | |
| 7084 } | |
| 7085 get_se_golomb(&s->gb); //second_chroma_qp_index_offset | |
| 7086 } | |
| 1168 | 7087 |
| 7088 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
| 2755 | 7089 av_log(h->s.avctx, AV_LOG_DEBUG, "pps:%d sps:%d %s slice_groups:%d ref:%d/%d %s qp:%d/%d/%d %s %s %s %s\n", |
| 1168 | 7090 pps_id, pps->sps_id, |
| 7091 pps->cabac ? "CABAC" : "CAVLC", | |
| 7092 pps->slice_group_count, | |
| 7093 pps->ref_count[0], pps->ref_count[1], | |
| 7094 pps->weighted_pred ? "weighted" : "", | |
| 7095 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset, | |
| 7096 pps->deblocking_filter_parameters_present ? "LPAR" : "", | |
| 7097 pps->constrained_intra_pred ? "CONSTR" : "", | |
| 2755 | 7098 pps->redundant_pic_cnt_present ? "REDU" : "", |
| 7099 pps->transform_8x8_mode ? "8x8DCT" : "" | |
| 1168 | 7100 ); |
| 7101 } | |
| 7102 | |
| 7103 return 0; | |
| 7104 } | |
| 7105 | |
| 7106 /** | |
| 7107 * finds the end of the current frame in the bitstream. | |
| 7108 * @return the position of the first byte of the next frame, or -1 | |
| 7109 */ | |
| 2392 | 7110 static int find_frame_end(H264Context *h, const uint8_t *buf, int buf_size){ |
| 1187 | 7111 int i; |
| 1168 | 7112 uint32_t state; |
| 2392 | 7113 ParseContext *pc = &(h->s.parse_context); |
| 1168 | 7114 //printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]); |
| 7115 // mb_addr= pc->mb_addr - 1; | |
| 7116 state= pc->state; | |
| 2392 | 7117 for(i=0; i<=buf_size; i++){ |
| 1168 | 7118 if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){ |
| 2392 | 7119 tprintf("find_frame_end new startcode = %08x, frame_start_found = %d, pos = %d\n", state, pc->frame_start_found, i); |
| 1168 | 7120 if(pc->frame_start_found){ |
| 2392 | 7121 // If there isn't one more byte in the buffer |
| 7122 // the test on first_mb_in_slice cannot be done yet | |
| 7123 // do it at next call. | |
| 7124 if (i >= buf_size) break; | |
| 7125 if (buf[i] & 0x80) { | |
| 7126 // first_mb_in_slice is 0, probably the first nal of a new | |
| 7127 // slice | |
| 7128 tprintf("find_frame_end frame_end_found, state = %08x, pos = %d\n", state, i); | |
| 7129 pc->state=-1; | |
| 7130 pc->frame_start_found= 0; | |
| 7131 return i-4; | |
| 7132 } | |
| 1168 | 7133 } |
| 2392 | 7134 pc->frame_start_found = 1; |
| 1168 | 7135 } |
|
2774
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7136 if((state&0xFFFFFF1F) == 0x107 || (state&0xFFFFFF1F) == 0x108 || (state&0xFFFFFF1F) == 0x109){ |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7137 if(pc->frame_start_found){ |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7138 pc->state=-1; |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7139 pc->frame_start_found= 0; |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7140 return i-4; |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7141 } |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7142 } |
| 2392 | 7143 if (i<buf_size) |
| 7144 state= (state<<8) | buf[i]; | |
| 1168 | 7145 } |
| 7146 | |
| 7147 pc->state= state; | |
| 1219 | 7148 return END_NOT_FOUND; |
| 1168 | 7149 } |
| 7150 | |
| 1988 | 7151 static int h264_parse(AVCodecParserContext *s, |
| 7152 AVCodecContext *avctx, | |
| 7153 uint8_t **poutbuf, int *poutbuf_size, | |
| 7154 const uint8_t *buf, int buf_size) | |
| 7155 { | |
| 2392 | 7156 H264Context *h = s->priv_data; |
| 7157 ParseContext *pc = &h->s.parse_context; | |
| 1988 | 7158 int next; |
| 7159 | |
| 2392 | 7160 next= find_frame_end(h, buf, buf_size); |
| 1988 | 7161 |
| 7162 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { | |
| 7163 *poutbuf = NULL; | |
| 7164 *poutbuf_size = 0; | |
| 7165 return buf_size; | |
| 7166 } | |
| 7167 | |
| 7168 *poutbuf = (uint8_t *)buf; | |
| 7169 *poutbuf_size = buf_size; | |
| 7170 return next; | |
| 7171 } | |
| 7172 | |
|
2774
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7173 static int h264_split(AVCodecContext *avctx, |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7174 const uint8_t *buf, int buf_size) |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7175 { |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7176 int i; |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7177 uint32_t state = -1; |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7178 int has_sps= 0; |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7179 |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7180 for(i=0; i<=buf_size; i++){ |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7181 if((state&0xFFFFFF1F) == 0x107) |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7182 has_sps=1; |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7183 /* if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){ |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7184 }*/ |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7185 if((state&0xFFFFFF00) == 0x100 && (state&0xFFFFFF1F) != 0x107 && (state&0xFFFFFF1F) != 0x108 && (state&0xFFFFFF1F) != 0x109){ |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7186 if(has_sps){ |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7187 while(i>4 && buf[i-5]==0) i--; |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7188 return i-4; |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7189 } |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7190 } |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7191 if (i<buf_size) |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7192 state= (state<<8) | buf[i]; |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7193 } |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7194 return 0; |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7195 } |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7196 |
|
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7197 |
| 1168 | 7198 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ |
| 7199 MpegEncContext * const s = &h->s; | |
| 7200 AVCodecContext * const avctx= s->avctx; | |
| 7201 int buf_index=0; | |
| 1322 | 7202 #if 0 |
| 1168 | 7203 int i; |
| 7204 for(i=0; i<32; i++){ | |
| 7205 printf("%X ", buf[i]); | |
| 7206 } | |
| 7207 #endif | |
| 2392 | 7208 h->slice_num = 0; |
|
2766
0609f405e000
make decoder a little bit more tolerant to missing NAL units
michael
parents:
2763
diff
changeset
|
7209 s->current_picture_ptr= NULL; |
| 1168 | 7210 for(;;){ |
| 7211 int consumed; | |
| 7212 int dst_length; | |
| 7213 int bit_length; | |
| 7214 uint8_t *ptr; | |
| 2227 | 7215 int i, nalsize = 0; |
| 1168 | 7216 |
| 2227 | 7217 if(h->is_avc) { |
| 7218 if(buf_index >= buf_size) break; | |
| 7219 nalsize = 0; | |
| 7220 for(i = 0; i < h->nal_length_size; i++) | |
| 7221 nalsize = (nalsize << 8) | buf[buf_index++]; | |
| 7222 } else { | |
| 1168 | 7223 // start code prefix search |
| 7224 for(; buf_index + 3 < buf_size; buf_index++){ | |
| 7225 // this should allways succeed in the first iteration | |
| 7226 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | |
| 7227 break; | |
| 7228 } | |
| 7229 | |
| 7230 if(buf_index+3 >= buf_size) break; | |
| 7231 | |
| 7232 buf_index+=3; | |
| 2227 | 7233 } |
| 1168 | 7234 |
|
2401
46898a9fd6dc
Fix avc1 if there is nore than one nal per mov frame
rtognimp
parents:
2396
diff
changeset
|
7235 ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index); |
| 1168 | 7236 if(ptr[dst_length - 1] == 0) dst_length--; |
| 7237 bit_length= 8*dst_length - decode_rbsp_trailing(ptr + dst_length - 1); | |
| 7238 | |
| 7239 if(s->avctx->debug&FF_DEBUG_STARTCODE){ | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
7240 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 | 7241 } |
| 7242 | |
| 2227 | 7243 if (h->is_avc && (nalsize != consumed)) |
| 7244 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); | |
| 7245 | |
| 1168 | 7246 buf_index += consumed; |
| 7247 | |
|
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
|
7248 if( s->hurry_up == 1 && h->nal_ref_idc == 0 ) |
| 1168 | 7249 continue; |
| 7250 | |
| 7251 switch(h->nal_unit_type){ | |
| 7252 case NAL_IDR_SLICE: | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7253 idr(h); //FIXME ensure we don't loose some frames if there is reordering |
| 1168 | 7254 case NAL_SLICE: |
| 7255 init_get_bits(&s->gb, ptr, bit_length); | |
| 7256 h->intra_gb_ptr= | |
| 7257 h->inter_gb_ptr= &s->gb; | |
| 7258 s->data_partitioning = 0; | |
| 7259 | |
| 2771 | 7260 if(decode_slice_header(h) < 0){ |
| 7261 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n"); | |
| 7262 break; | |
| 7263 } | |
|
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
|
7264 if(h->redundant_pic_count==0 && s->hurry_up < 5 ) |
| 1168 | 7265 decode_slice(h); |
| 7266 break; | |
| 7267 case NAL_DPA: | |
| 7268 init_get_bits(&s->gb, ptr, bit_length); | |
| 7269 h->intra_gb_ptr= | |
| 7270 h->inter_gb_ptr= NULL; | |
| 7271 s->data_partitioning = 1; | |
| 7272 | |
| 2771 | 7273 if(decode_slice_header(h) < 0){ |
| 7274 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n"); | |
| 7275 } | |
| 1168 | 7276 break; |
| 7277 case NAL_DPB: | |
| 7278 init_get_bits(&h->intra_gb, ptr, bit_length); | |
| 7279 h->intra_gb_ptr= &h->intra_gb; | |
| 7280 break; | |
| 7281 case NAL_DPC: | |
| 7282 init_get_bits(&h->inter_gb, ptr, bit_length); | |
| 7283 h->inter_gb_ptr= &h->inter_gb; | |
| 1174 | 7284 |
|
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
|
7285 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning && s->hurry_up < 5 ) |
| 1168 | 7286 decode_slice(h); |
| 7287 break; | |
| 7288 case NAL_SEI: | |
| 7289 break; | |
| 7290 case NAL_SPS: | |
| 7291 init_get_bits(&s->gb, ptr, bit_length); | |
| 7292 decode_seq_parameter_set(h); | |
| 7293 | |
| 7294 if(s->flags& CODEC_FLAG_LOW_DELAY) | |
| 7295 s->low_delay=1; | |
| 7296 | |
| 2538 | 7297 if(avctx->has_b_frames < 2) |
| 7298 avctx->has_b_frames= !s->low_delay; | |
| 1168 | 7299 break; |
| 7300 case NAL_PPS: | |
| 7301 init_get_bits(&s->gb, ptr, bit_length); | |
| 7302 | |
| 2755 | 7303 decode_picture_parameter_set(h, bit_length); |
| 1168 | 7304 |
| 7305 break; | |
| 7306 case NAL_PICTURE_DELIMITER: | |
| 7307 break; | |
| 7308 case NAL_FILTER_DATA: | |
| 7309 break; | |
| 2099 | 7310 default: |
| 7311 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type); | |
| 1168 | 7312 } |
| 7313 } | |
| 7314 | |
| 1174 | 7315 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
|
7316 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7317 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
|
7318 s->current_picture_ptr->key_frame= s->pict_type == I_TYPE && h->nal_unit_type == NAL_IDR_SLICE; |
| 1174 | 7319 |
| 1168 | 7320 h->prev_frame_num_offset= h->frame_num_offset; |
| 7321 h->prev_frame_num= h->frame_num; | |
| 7322 if(s->current_picture_ptr->reference){ | |
| 7323 h->prev_poc_msb= h->poc_msb; | |
| 7324 h->prev_poc_lsb= h->poc_lsb; | |
| 7325 } | |
| 7326 if(s->current_picture_ptr->reference) | |
| 7327 execute_ref_pic_marking(h, h->mmco, h->mmco_index); | |
| 7328 | |
| 7329 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
|
7330 |
| 1168 | 7331 MPV_frame_end(s); |
| 7332 | |
| 7333 return buf_index; | |
| 7334 } | |
| 7335 | |
| 7336 /** | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7337 * returns the number of bytes consumed for building the current frame |
| 1168 | 7338 */ |
| 7339 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){ | |
| 7340 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
| 7341 pos -= s->parse_context.last_index; | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7342 if(pos<0) pos=0; // FIXME remove (unneeded?) |
| 1168 | 7343 |
| 7344 return pos; | |
| 7345 }else{ | |
| 7346 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...) | |
| 7347 if(pos+10>buf_size) pos=buf_size; // oops ;) | |
| 7348 | |
| 7349 return pos; | |
| 7350 } | |
| 7351 } | |
| 7352 | |
| 7353 static int decode_frame(AVCodecContext *avctx, | |
| 7354 void *data, int *data_size, | |
| 7355 uint8_t *buf, int buf_size) | |
| 7356 { | |
| 7357 H264Context *h = avctx->priv_data; | |
| 7358 MpegEncContext *s = &h->s; | |
| 7359 AVFrame *pict = data; | |
| 7360 int buf_index; | |
| 7361 | |
| 7362 s->flags= avctx->flags; | |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1706
diff
changeset
|
7363 s->flags2= avctx->flags2; |
| 1168 | 7364 |
| 7365 /* no supplementary picture */ | |
| 7366 if (buf_size == 0) { | |
| 7367 return 0; | |
| 7368 } | |
| 7369 | |
| 7370 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
| 2392 | 7371 int next= find_frame_end(h, buf, buf_size); |
| 1168 | 7372 |
| 1988 | 7373 if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 ) |
| 1168 | 7374 return buf_size; |
| 7375 //printf("next:%d buf_size:%d last_index:%d\n", next, buf_size, s->parse_context.last_index); | |
| 7376 } | |
| 7377 | |
| 2227 | 7378 if(h->is_avc && !h->got_avcC) { |
| 7379 int i, cnt, nalsize; | |
| 7380 unsigned char *p = avctx->extradata; | |
| 7381 if(avctx->extradata_size < 7) { | |
| 7382 av_log(avctx, AV_LOG_ERROR, "avcC too short\n"); | |
| 7383 return -1; | |
| 7384 } | |
| 7385 if(*p != 1) { | |
| 7386 av_log(avctx, AV_LOG_ERROR, "Unknown avcC version %d\n", *p); | |
| 7387 return -1; | |
| 7388 } | |
| 7389 /* sps and pps in the avcC always have length coded with 2 bytes, | |
| 7390 so put a fake nal_length_size = 2 while parsing them */ | |
| 7391 h->nal_length_size = 2; | |
| 7392 // Decode sps from avcC | |
| 7393 cnt = *(p+5) & 0x1f; // Number of sps | |
| 7394 p += 6; | |
| 7395 for (i = 0; i < cnt; i++) { | |
| 7396 nalsize = BE_16(p) + 2; | |
| 7397 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
| 7398 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); | |
| 7399 return -1; | |
| 7400 } | |
| 7401 p += nalsize; | |
| 7402 } | |
| 7403 // Decode pps from avcC | |
| 7404 cnt = *(p++); // Number of pps | |
| 7405 for (i = 0; i < cnt; i++) { | |
| 7406 nalsize = BE_16(p) + 2; | |
| 7407 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
| 7408 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); | |
| 7409 return -1; | |
| 7410 } | |
| 7411 p += nalsize; | |
| 7412 } | |
| 7413 // Now store right nal length size, that will be use to parse all other nals | |
| 7414 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1; | |
| 7415 // Do not reparse avcC | |
| 7416 h->got_avcC = 1; | |
| 7417 } | |
| 7418 | |
| 7419 if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){ | |
|
2762
64333ef1ca21
non-avc h264 stream problems patch by ("Ronald S. Bultje" rbultje, ronald bitfreak net)
michael
parents:
2758
diff
changeset
|
7420 if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0) |
| 1168 | 7421 return -1; |
| 7422 } | |
| 7423 | |
| 7424 buf_index=decode_nal_units(h, buf, buf_size); | |
| 7425 if(buf_index < 0) | |
| 7426 return -1; | |
| 7427 | |
| 7428 //FIXME do something with unavailable reference frames | |
| 7429 | |
|
2628
511e3afc43e1
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents:
2623
diff
changeset
|
7430 // if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_index, buf_size); |
| 1174 | 7431 if(!s->current_picture_ptr){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
7432 av_log(h->s.avctx, AV_LOG_DEBUG, "error, NO frame\n"); |
| 1174 | 7433 return -1; |
| 7434 } | |
| 7435 | |
| 2409 | 7436 { |
|
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
|
7437 Picture *out = s->current_picture_ptr; |
| 2561 | 7438 #if 0 //decode order |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7439 *data_size = sizeof(AVFrame); |
| 2561 | 7440 #else |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7441 /* Sort B-frames into display order */ |
| 2409 | 7442 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
|
7443 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
|
7444 int out_idx = 0; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7445 int pics = 0; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7446 int out_of_order; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7447 int cross_idr = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7448 int dropped_frame = 0; |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7449 int i; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7450 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7451 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
|
7452 && 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
|
7453 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
|
7454 s->low_delay = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7455 } |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7456 |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7457 while(h->delayed_pic[pics]) pics++; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7458 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
|
7459 if(cur->reference == 0) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7460 cur->reference = 1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7461 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7462 for(i=0; h->delayed_pic[i]; i++) |
|
2649
b2e6c5e9240b
fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents:
2648
diff
changeset
|
7463 if(h->delayed_pic[i]->key_frame || h->delayed_pic[i]->poc==0) |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7464 cross_idr = 1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7465 |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7466 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
|
7467 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
|
7468 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
|
7469 out = h->delayed_pic[i]; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7470 out_idx = i; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7471 } |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7472 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7473 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
|
7474 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
|
7475 out = prev; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7476 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
|
7477 || (s->low_delay && |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7478 ((!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
|
7479 || cur->pict_type == B_TYPE))) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7480 { |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7481 s->low_delay = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7482 s->avctx->has_b_frames++; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7483 out = prev; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7484 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7485 else if(out_of_order) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7486 out = prev; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7487 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7488 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
|
7489 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
|
7490 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
|
7491 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
|
7492 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7493 |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7494 if(prev == out && !dropped_frame) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7495 *data_size = 0; |
| 2561 | 7496 else |
| 7497 *data_size = sizeof(AVFrame); | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7498 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
|
7499 prev->reference = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7500 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
|
7501 #endif |
| 2409 | 7502 |
| 7503 *pict= *(AVFrame*)out; | |
| 7504 } | |
| 7505 | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7506 assert(pict->data[0]); |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1698
diff
changeset
|
7507 ff_print_debug_info(s, pict); |
| 1168 | 7508 //printf("out %d\n", (int)pict->data[0]); |
| 7509 #if 0 //? | |
| 7510 | |
| 7511 /* Return the Picture timestamp as the frame number */ | |
| 7512 /* we substract 1 because it is added on utils.c */ | |
| 7513 avctx->frame_number = s->picture_number - 1; | |
| 7514 #endif | |
| 7515 return get_consumed_bytes(s, buf_index, buf_size); | |
| 7516 } | |
| 7517 #if 0 | |
| 7518 static inline void fill_mb_avail(H264Context *h){ | |
| 7519 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
|
7520 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 7521 |
| 7522 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
|
7523 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
|
7524 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
|
7525 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num; |
| 1168 | 7526 }else{ |
| 7527 h->mb_avail[0]= | |
| 7528 h->mb_avail[1]= | |
| 7529 h->mb_avail[2]= 0; | |
| 7530 } | |
| 7531 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num; | |
| 7532 h->mb_avail[4]= 1; //FIXME move out | |
| 7533 h->mb_avail[5]= 0; //FIXME move out | |
| 7534 } | |
| 7535 #endif | |
| 7536 | |
| 7537 #if 0 //selftest | |
| 7538 #define COUNT 8000 | |
| 7539 #define SIZE (COUNT*40) | |
| 7540 int main(){ | |
| 7541 int i; | |
| 7542 uint8_t temp[SIZE]; | |
| 7543 PutBitContext pb; | |
| 7544 GetBitContext gb; | |
| 7545 // int int_temp[10000]; | |
| 7546 DSPContext dsp; | |
| 7547 AVCodecContext avctx; | |
| 7548 | |
| 7549 dsputil_init(&dsp, &avctx); | |
| 7550 | |
|
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1453
diff
changeset
|
7551 init_put_bits(&pb, temp, SIZE); |
| 1168 | 7552 printf("testing unsigned exp golomb\n"); |
| 7553 for(i=0; i<COUNT; i++){ | |
| 7554 START_TIMER | |
| 7555 set_ue_golomb(&pb, i); | |
| 7556 STOP_TIMER("set_ue_golomb"); | |
| 7557 } | |
| 7558 flush_put_bits(&pb); | |
| 7559 | |
| 7560 init_get_bits(&gb, temp, 8*SIZE); | |
| 7561 for(i=0; i<COUNT; i++){ | |
| 7562 int j, s; | |
| 7563 | |
| 7564 s= show_bits(&gb, 24); | |
| 7565 | |
| 7566 START_TIMER | |
| 7567 j= get_ue_golomb(&gb); | |
| 7568 if(j != i){ | |
| 7569 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
| 7570 // return -1; | |
| 7571 } | |
| 7572 STOP_TIMER("get_ue_golomb"); | |
| 7573 } | |
| 7574 | |
| 7575 | |
| 1524 | 7576 init_put_bits(&pb, temp, SIZE); |
| 1168 | 7577 printf("testing signed exp golomb\n"); |
| 7578 for(i=0; i<COUNT; i++){ | |
| 7579 START_TIMER | |
| 7580 set_se_golomb(&pb, i - COUNT/2); | |
| 7581 STOP_TIMER("set_se_golomb"); | |
| 7582 } | |
| 7583 flush_put_bits(&pb); | |
| 7584 | |
| 7585 init_get_bits(&gb, temp, 8*SIZE); | |
| 7586 for(i=0; i<COUNT; i++){ | |
| 7587 int j, s; | |
| 7588 | |
| 7589 s= show_bits(&gb, 24); | |
| 7590 | |
| 7591 START_TIMER | |
| 7592 j= get_se_golomb(&gb); | |
| 7593 if(j != i - COUNT/2){ | |
| 7594 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
| 7595 // return -1; | |
| 7596 } | |
| 7597 STOP_TIMER("get_se_golomb"); | |
| 7598 } | |
| 7599 | |
| 7600 printf("testing 4x4 (I)DCT\n"); | |
| 7601 | |
| 7602 DCTELEM block[16]; | |
| 7603 uint8_t src[16], ref[16]; | |
| 7604 uint64_t error= 0, max_error=0; | |
| 7605 | |
| 7606 for(i=0; i<COUNT; i++){ | |
| 7607 int j; | |
| 7608 // printf("%d %d %d\n", r1, r2, (r2-r1)*16); | |
| 7609 for(j=0; j<16; j++){ | |
| 7610 ref[j]= random()%255; | |
| 7611 src[j]= random()%255; | |
| 7612 } | |
| 7613 | |
| 7614 h264_diff_dct_c(block, src, ref, 4); | |
| 7615 | |
| 7616 //normalize | |
| 7617 for(j=0; j<16; j++){ | |
| 7618 // printf("%d ", block[j]); | |
| 7619 block[j]= block[j]*4; | |
| 7620 if(j&1) block[j]= (block[j]*4 + 2)/5; | |
| 7621 if(j&4) block[j]= (block[j]*4 + 2)/5; | |
| 7622 } | |
| 7623 // printf("\n"); | |
| 7624 | |
|
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
7625 s->dsp.h264_idct_add(ref, block, 4); |
| 1168 | 7626 /* for(j=0; j<16; j++){ |
| 7627 printf("%d ", ref[j]); | |
| 7628 } | |
| 7629 printf("\n");*/ | |
| 7630 | |
| 7631 for(j=0; j<16; j++){ | |
| 7632 int diff= ABS(src[j] - ref[j]); | |
| 7633 | |
| 7634 error+= diff*diff; | |
| 7635 max_error= FFMAX(max_error, diff); | |
| 7636 } | |
| 7637 } | |
| 7638 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error ); | |
| 7639 #if 0 | |
| 7640 printf("testing quantizer\n"); | |
| 7641 for(qp=0; qp<52; qp++){ | |
| 7642 for(i=0; i<16; i++) | |
| 7643 src1_block[i]= src2_block[i]= random()%255; | |
| 7644 | |
| 7645 } | |
| 7646 #endif | |
| 7647 printf("Testing NAL layer\n"); | |
| 7648 | |
| 7649 uint8_t bitstream[COUNT]; | |
| 7650 uint8_t nal[COUNT*2]; | |
| 7651 H264Context h; | |
| 7652 memset(&h, 0, sizeof(H264Context)); | |
| 7653 | |
| 7654 for(i=0; i<COUNT; i++){ | |
| 7655 int zeros= i; | |
| 7656 int nal_length; | |
| 7657 int consumed; | |
| 7658 int out_length; | |
| 7659 uint8_t *out; | |
| 7660 int j; | |
| 7661 | |
| 7662 for(j=0; j<COUNT; j++){ | |
| 7663 bitstream[j]= (random() % 255) + 1; | |
| 7664 } | |
| 7665 | |
| 7666 for(j=0; j<zeros; j++){ | |
| 7667 int pos= random() % COUNT; | |
| 7668 while(bitstream[pos] == 0){ | |
| 7669 pos++; | |
| 7670 pos %= COUNT; | |
| 7671 } | |
| 7672 bitstream[pos]=0; | |
| 7673 } | |
| 7674 | |
| 7675 START_TIMER | |
| 7676 | |
| 7677 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2); | |
| 7678 if(nal_length<0){ | |
| 7679 printf("encoding failed\n"); | |
| 7680 return -1; | |
| 7681 } | |
| 7682 | |
| 7683 out= decode_nal(&h, nal, &out_length, &consumed, nal_length); | |
| 7684 | |
| 7685 STOP_TIMER("NAL") | |
| 7686 | |
| 7687 if(out_length != COUNT){ | |
| 7688 printf("incorrect length %d %d\n", out_length, COUNT); | |
| 7689 return -1; | |
| 7690 } | |
| 7691 | |
| 7692 if(consumed != nal_length){ | |
| 7693 printf("incorrect consumed length %d %d\n", nal_length, consumed); | |
| 7694 return -1; | |
| 7695 } | |
| 7696 | |
| 7697 if(memcmp(bitstream, out, COUNT)){ | |
| 7698 printf("missmatch\n"); | |
| 7699 return -1; | |
| 7700 } | |
| 7701 } | |
| 7702 | |
| 7703 printf("Testing RBSP\n"); | |
| 7704 | |
| 7705 | |
| 7706 return 0; | |
| 7707 } | |
| 7708 #endif | |
| 7709 | |
| 7710 | |
| 7711 static int decode_end(AVCodecContext *avctx) | |
| 7712 { | |
| 7713 H264Context *h = avctx->priv_data; | |
| 7714 MpegEncContext *s = &h->s; | |
| 7715 | |
| 7716 free_tables(h); //FIXME cleanup init stuff perhaps | |
| 7717 MPV_common_end(s); | |
| 7718 | |
| 7719 // memset(h, 0, sizeof(H264Context)); | |
| 7720 | |
| 7721 return 0; | |
| 7722 } | |
| 7723 | |
| 7724 | |
| 7725 AVCodec h264_decoder = { | |
| 7726 "h264", | |
| 7727 CODEC_TYPE_VIDEO, | |
| 7728 CODEC_ID_H264, | |
| 7729 sizeof(H264Context), | |
| 7730 decode_init, | |
| 7731 NULL, | |
| 7732 decode_end, | |
| 7733 decode_frame, | |
| 2453 | 7734 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
| 2640 | 7735 .flush= flush_dpb, |
| 1168 | 7736 }; |
| 7737 | |
| 1988 | 7738 AVCodecParser h264_parser = { |
| 7739 { CODEC_ID_H264 }, | |
| 2392 | 7740 sizeof(H264Context), |
| 1988 | 7741 NULL, |
| 7742 h264_parse, | |
| 7743 ff_parse_close, | |
|
2774
3eddfe241bb9
support extracting sps/pps from bitstream and putting it in extradata
michael
parents:
2773
diff
changeset
|
7744 h264_split, |
| 1988 | 7745 }; |
| 7746 | |
| 1234 | 7747 #include "svq3.c" |
