Mercurial > libavcodec.hg
annotate h264.c @ 2758:a7925aaeea1e libavcodec
10l (dont read variables before they have been set)
| author | michael |
|---|---|
| date | Sun, 05 Jun 2005 15:51:20 +0000 |
| parents | fa1c8955e291 |
| children | 64333ef1ca21 |
| rev | line source |
|---|---|
| 1168 | 1 /* |
| 2 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder | |
| 3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> | |
| 4 * | |
| 5 * This library is free software; you can redistribute it and/or | |
| 6 * modify it under the terms of the GNU Lesser General Public | |
| 7 * License as published by the Free Software Foundation; either | |
| 8 * version 2 of the License, or (at your option) any later version. | |
| 9 * | |
| 10 * This library is distributed in the hope that it will be useful, | |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 * Lesser General Public License for more details. | |
| 14 * | |
| 15 * You should have received a copy of the GNU Lesser General Public | |
| 16 * License along with this library; if not, write to the Free Software | |
| 17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 * | |
| 19 */ | |
| 20 | |
| 21 /** | |
| 22 * @file h264.c | |
| 23 * H.264 / AVC / MPEG4 part10 codec. | |
| 24 * @author Michael Niedermayer <michaelni@gmx.at> | |
| 25 */ | |
| 26 | |
| 27 #include "common.h" | |
| 28 #include "dsputil.h" | |
| 29 #include "avcodec.h" | |
| 30 #include "mpegvideo.h" | |
| 31 #include "h264data.h" | |
| 32 #include "golomb.h" | |
| 33 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
34 #include "cabac.h" |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
35 |
| 1168 | 36 #undef NDEBUG |
| 37 #include <assert.h> | |
| 38 | |
| 39 #define interlaced_dct interlaced_dct_is_a_bad_name | |
| 40 #define mb_intra mb_intra_isnt_initalized_see_mb_type | |
| 41 | |
| 42 #define LUMA_DC_BLOCK_INDEX 25 | |
| 43 #define CHROMA_DC_BLOCK_INDEX 26 | |
| 44 | |
| 45 #define CHROMA_DC_COEFF_TOKEN_VLC_BITS 8 | |
| 46 #define COEFF_TOKEN_VLC_BITS 8 | |
| 47 #define TOTAL_ZEROS_VLC_BITS 9 | |
| 48 #define CHROMA_DC_TOTAL_ZEROS_VLC_BITS 3 | |
| 49 #define RUN_VLC_BITS 3 | |
| 50 #define RUN7_VLC_BITS 6 | |
| 51 | |
| 52 #define MAX_SPS_COUNT 32 | |
| 53 #define MAX_PPS_COUNT 256 | |
| 54 | |
| 55 #define MAX_MMCO_COUNT 66 | |
| 56 | |
| 57 /** | |
| 58 * Sequence parameter set | |
| 59 */ | |
| 60 typedef struct SPS{ | |
| 61 | |
| 62 int profile_idc; | |
| 63 int level_idc; | |
| 64 int log2_max_frame_num; ///< log2_max_frame_num_minus4 + 4 | |
| 65 int poc_type; ///< pic_order_cnt_type | |
| 66 int log2_max_poc_lsb; ///< log2_max_pic_order_cnt_lsb_minus4 | |
| 67 int delta_pic_order_always_zero_flag; | |
| 68 int offset_for_non_ref_pic; | |
| 69 int offset_for_top_to_bottom_field; | |
| 70 int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle | |
| 71 int ref_frame_count; ///< num_ref_frames | |
| 1371 | 72 int gaps_in_frame_num_allowed_flag; |
| 1168 | 73 int mb_width; ///< frame_width_in_mbs_minus1 + 1 |
| 74 int mb_height; ///< frame_height_in_mbs_minus1 + 1 | |
| 75 int frame_mbs_only_flag; | |
| 76 int mb_aff; ///<mb_adaptive_frame_field_flag | |
| 77 int direct_8x8_inference_flag; | |
| 1371 | 78 int crop; ///< frame_cropping_flag |
| 79 int crop_left; ///< frame_cropping_rect_left_offset | |
| 80 int crop_right; ///< frame_cropping_rect_right_offset | |
| 81 int crop_top; ///< frame_cropping_rect_top_offset | |
| 82 int crop_bottom; ///< frame_cropping_rect_bottom_offset | |
| 1168 | 83 int vui_parameters_present_flag; |
| 1548 | 84 AVRational sar; |
|
2174
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
85 int timing_info_present_flag; |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
86 uint32_t num_units_in_tick; |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
87 uint32_t time_scale; |
|
6d614374d907
Get H.264 frame rate from SPS/VUI patch by (M?ns Rullg?rd <mru at kth dot se>)
michael
parents:
2163
diff
changeset
|
88 int fixed_frame_rate_flag; |
| 1168 | 89 short offset_for_ref_frame[256]; //FIXME dyn aloc? |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
90 int bitstream_restriction_flag; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
91 int num_reorder_frames; |
| 1168 | 92 }SPS; |
| 93 | |
| 94 /** | |
| 95 * Picture parameter set | |
| 96 */ | |
| 97 typedef struct PPS{ | |
| 98 int sps_id; | |
| 99 int cabac; ///< entropy_coding_mode_flag | |
| 100 int pic_order_present; ///< pic_order_present_flag | |
| 101 int slice_group_count; ///< num_slice_groups_minus1 + 1 | |
| 102 int mb_slice_group_map_type; | |
| 103 int ref_count[2]; ///< num_ref_idx_l0/1_active_minus1 + 1 | |
| 104 int weighted_pred; ///< weighted_pred_flag | |
| 105 int weighted_bipred_idc; | |
| 106 int init_qp; ///< pic_init_qp_minus26 + 26 | |
| 107 int init_qs; ///< pic_init_qs_minus26 + 26 | |
| 108 int chroma_qp_index_offset; | |
| 109 int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag | |
| 110 int constrained_intra_pred; ///< constrained_intra_pred_flag | |
| 111 int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag | |
| 2755 | 112 int transform_8x8_mode; ///< transform_8x8_mode_flag |
| 1168 | 113 }PPS; |
| 114 | |
| 115 /** | |
| 116 * Memory management control operation opcode. | |
| 117 */ | |
| 118 typedef enum MMCOOpcode{ | |
| 119 MMCO_END=0, | |
| 120 MMCO_SHORT2UNUSED, | |
| 121 MMCO_LONG2UNUSED, | |
| 122 MMCO_SHORT2LONG, | |
| 123 MMCO_SET_MAX_LONG, | |
| 124 MMCO_RESET, | |
| 125 MMCO_LONG, | |
| 126 } MMCOOpcode; | |
| 127 | |
| 128 /** | |
| 129 * Memory management control operation. | |
| 130 */ | |
| 131 typedef struct MMCO{ | |
| 132 MMCOOpcode opcode; | |
| 133 int short_frame_num; | |
| 134 int long_index; | |
| 135 } MMCO; | |
| 136 | |
| 137 /** | |
| 138 * H264Context | |
| 139 */ | |
| 140 typedef struct H264Context{ | |
| 141 MpegEncContext s; | |
| 142 int nal_ref_idc; | |
| 143 int nal_unit_type; | |
| 144 #define NAL_SLICE 1 | |
| 145 #define NAL_DPA 2 | |
| 146 #define NAL_DPB 3 | |
| 147 #define NAL_DPC 4 | |
| 148 #define NAL_IDR_SLICE 5 | |
| 149 #define NAL_SEI 6 | |
| 150 #define NAL_SPS 7 | |
| 151 #define NAL_PPS 8 | |
| 152 #define NAL_PICTURE_DELIMITER 9 | |
| 153 #define NAL_FILTER_DATA 10 | |
| 154 uint8_t *rbsp_buffer; | |
| 155 int rbsp_buffer_size; | |
| 156 | |
| 2227 | 157 /** |
| 158 * Used to parse AVC variant of h264 | |
| 159 */ | |
| 160 int is_avc; ///< this flag is != 0 if codec is avc1 | |
| 161 int got_avcC; ///< flag used to parse avcC data only once | |
| 162 int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) | |
| 163 | |
| 1168 | 164 int chroma_qp; //QPc |
| 165 | |
|
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
|
166 int prev_mb_skipped; //FIXME remove (IMHO not used) |
| 1168 | 167 |
| 168 //prediction stuff | |
| 169 int chroma_pred_mode; | |
| 170 int intra16x16_pred_mode; | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
171 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
172 int top_mb_xy; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
173 int left_mb_xy[2]; |
| 1168 | 174 |
| 175 int8_t intra4x4_pred_mode_cache[5*8]; | |
| 176 int8_t (*intra4x4_pred_mode)[8]; | |
| 177 void (*pred4x4 [9+3])(uint8_t *src, uint8_t *topright, int stride);//FIXME move to dsp? | |
| 2755 | 178 void (*pred8x8l [9+3])(uint8_t *src, int topleft, int topright, int stride); |
| 1168 | 179 void (*pred8x8 [4+3])(uint8_t *src, int stride); |
| 180 void (*pred16x16[4+3])(uint8_t *src, int stride); | |
| 181 unsigned int topleft_samples_available; | |
| 182 unsigned int top_samples_available; | |
| 183 unsigned int topright_samples_available; | |
| 184 unsigned int left_samples_available; | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
185 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
|
186 uint8_t left_border[2*(17+2*9)]; |
| 1168 | 187 |
| 188 /** | |
| 189 * non zero coeff count cache. | |
| 190 * is 64 if not available. | |
| 191 */ | |
|
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
192 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
|
193 uint8_t (*non_zero_count)[16]; |
| 1168 | 194 |
| 195 /** | |
| 196 * Motion vector cache. | |
| 197 */ | |
|
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
198 int16_t mv_cache[2][5*8][2] __align8; |
|
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
199 int8_t ref_cache[2][5*8] __align8; |
| 1168 | 200 #define LIST_NOT_USED -1 //FIXME rename? |
| 201 #define PART_NOT_AVAILABLE -2 | |
| 202 | |
| 203 /** | |
| 204 * is 1 if the specific list MV&references are set to 0,0,-2. | |
| 205 */ | |
| 206 int mv_cache_clean[2]; | |
| 207 | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
208 /** |
| 2755 | 209 * number of neighbors (top and/or left) that used 8x8 dct |
| 210 */ | |
| 211 int neighbor_transform_size; | |
| 212 | |
| 213 /** | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
214 * 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
|
215 * 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
|
216 */ |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
217 int block_offset[2*(16+8)]; |
| 1168 | 218 |
|
2641
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
219 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
|
220 uint32_t *mb2b8_xy; |
| 2395 | 221 int b_stride; //FIXME use s->b4_stride |
| 1168 | 222 int b8_stride; |
| 223 | |
| 1234 | 224 int halfpel_flag; |
| 225 int thirdpel_flag; | |
| 226 | |
| 1319 | 227 int unknown_svq3_flag; |
| 228 int next_slice_index; | |
| 229 | |
| 1168 | 230 SPS sps_buffer[MAX_SPS_COUNT]; |
| 231 SPS sps; ///< current sps | |
| 232 | |
| 233 PPS pps_buffer[MAX_PPS_COUNT]; | |
| 234 /** | |
| 235 * current pps | |
| 236 */ | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
237 PPS pps; //FIXME move to Picture perhaps? (->no) do we need that? |
| 1168 | 238 |
| 2755 | 239 uint16_t (*dequant8_coeff)[64]; |
| 240 | |
| 1168 | 241 int slice_num; |
| 242 uint8_t *slice_table_base; | |
| 243 uint8_t *slice_table; ///< slice_table_base + mb_stride + 1 | |
| 244 int slice_type; | |
| 245 int slice_type_fixed; | |
| 246 | |
| 247 //interlacing specific flags | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
248 int mb_aff_frame; |
| 1168 | 249 int mb_field_decoding_flag; |
| 250 | |
| 251 int sub_mb_type[4]; | |
| 252 | |
| 253 //POC stuff | |
| 254 int poc_lsb; | |
| 255 int poc_msb; | |
| 256 int delta_poc_bottom; | |
| 257 int delta_poc[2]; | |
| 258 int frame_num; | |
| 259 int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0 | |
| 260 int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0 | |
| 261 int frame_num_offset; ///< for POC type 2 | |
| 262 int prev_frame_num_offset; ///< for POC type 2 | |
| 263 int prev_frame_num; ///< frame_num of the last pic for POC type 1/2 | |
| 264 | |
| 265 /** | |
| 266 * frame_num for frames or 2*frame_num for field pics. | |
| 267 */ | |
| 268 int curr_pic_num; | |
| 269 | |
| 270 /** | |
| 271 * max_frame_num or 2*max_frame_num for field pics. | |
| 272 */ | |
| 273 int max_pic_num; | |
| 274 | |
| 275 //Weighted pred stuff | |
| 2415 | 276 int use_weight; |
| 277 int use_weight_chroma; | |
| 1168 | 278 int luma_log2_weight_denom; |
| 279 int chroma_log2_weight_denom; | |
| 280 int luma_weight[2][16]; | |
| 281 int luma_offset[2][16]; | |
| 282 int chroma_weight[2][16][2]; | |
| 283 int chroma_offset[2][16][2]; | |
| 2415 | 284 int implicit_weight[16][16]; |
| 1168 | 285 |
| 286 //deblock | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
287 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
|
288 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
|
289 int slice_beta_offset; |
| 1168 | 290 |
| 291 int redundant_pic_count; | |
| 292 | |
| 293 int direct_spatial_mv_pred; | |
| 2396 | 294 int dist_scale_factor[16]; |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
295 int map_col_to_list0[2][16]; |
| 1168 | 296 |
| 297 /** | |
| 298 * num_ref_idx_l0/1_active_minus1 + 1 | |
| 299 */ | |
| 300 int ref_count[2];// FIXME split for AFF | |
| 2582 | 301 Picture *short_ref[32]; |
| 302 Picture *long_ref[32]; | |
| 1168 | 303 Picture default_ref_list[2][32]; |
| 304 Picture ref_list[2][32]; //FIXME size? | |
| 305 Picture field_ref_list[2][32]; //FIXME size? | |
| 2409 | 306 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
|
307 Picture *delayed_output_pic; |
| 1168 | 308 |
| 309 /** | |
| 310 * memory management control operations buffer. | |
| 311 */ | |
| 312 MMCO mmco[MAX_MMCO_COUNT]; | |
| 313 int mmco_index; | |
| 314 | |
| 315 int long_ref_count; ///< number of actual long term references | |
| 316 int short_ref_count; ///< number of actual short term references | |
| 317 | |
| 318 //data partitioning | |
| 319 GetBitContext intra_gb; | |
| 320 GetBitContext inter_gb; | |
| 321 GetBitContext *intra_gb_ptr; | |
| 322 GetBitContext *inter_gb_ptr; | |
| 323 | |
| 324 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
|
325 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
326 /** |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
327 * Cabac |
|
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 CABACContext cabac; |
| 2755 | 330 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
|
331 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
|
332 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
333 /* 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
|
334 uint16_t *cbp_table; |
| 2314 | 335 int top_cbp; |
| 336 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
|
337 /* 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
|
338 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
|
339 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
|
340 int16_t (*mvd_table[2])[2]; |
|
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
341 int16_t mvd_cache[2][5*8][2] __align8; |
| 2396 | 342 uint8_t *direct_table; |
| 343 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
|
344 |
|
2748
135aa7d0bd17
avoid one transpose (730->680 dezicycles on duron)
michael
parents:
2717
diff
changeset
|
345 uint8_t zigzag_scan[16]; |
|
135aa7d0bd17
avoid one transpose (730->680 dezicycles on duron)
michael
parents:
2717
diff
changeset
|
346 uint8_t field_scan[16]; |
| 1168 | 347 }H264Context; |
| 348 | |
| 349 static VLC coeff_token_vlc[4]; | |
| 350 static VLC chroma_dc_coeff_token_vlc; | |
| 351 | |
| 352 static VLC total_zeros_vlc[15]; | |
| 353 static VLC chroma_dc_total_zeros_vlc[3]; | |
| 354 | |
| 355 static VLC run_vlc[6]; | |
| 356 static VLC run7_vlc; | |
| 357 | |
| 1234 | 358 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); |
| 359 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
|
360 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 | 361 |
| 1269 | 362 static inline uint32_t pack16to32(int a, int b){ |
| 363 #ifdef WORDS_BIGENDIAN | |
| 364 return (b&0xFFFF) + (a<<16); | |
| 365 #else | |
| 366 return (a&0xFFFF) + (b<<16); | |
| 367 #endif | |
| 368 } | |
| 369 | |
| 1168 | 370 /** |
| 371 * fill a rectangle. | |
| 2392 | 372 * @param h height of the rectangle, should be a constant |
| 373 * @param w width of the rectangle, should be a constant | |
| 1168 | 374 * @param size the size of val (1 or 4), should be a constant |
| 375 */ | |
| 1187 | 376 static inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){ //FIXME ensure this IS inlined |
| 377 uint8_t *p= (uint8_t*)vp; | |
| 1168 | 378 assert(size==1 || size==4); |
| 379 | |
| 380 w *= size; | |
| 381 stride *= size; | |
| 382 | |
|
2471
805431763e84
fixing missaligned memory accesses in fill_rectangle()
michael
parents:
2454
diff
changeset
|
383 assert((((int)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0); |
| 2669 | 384 assert((stride&(w-1))==0); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
385 //FIXME check what gcc generates for 64 bit on x86 and possibly write a 32 bit ver of it |
| 1168 | 386 if(w==2 && h==2){ |
| 387 *(uint16_t*)(p + 0)= | |
| 388 *(uint16_t*)(p + stride)= size==4 ? val : val*0x0101; | |
| 389 }else if(w==2 && h==4){ | |
| 390 *(uint16_t*)(p + 0*stride)= | |
| 391 *(uint16_t*)(p + 1*stride)= | |
| 392 *(uint16_t*)(p + 2*stride)= | |
| 393 *(uint16_t*)(p + 3*stride)= size==4 ? val : val*0x0101; | |
| 1252 | 394 }else if(w==4 && h==1){ |
| 395 *(uint32_t*)(p + 0*stride)= size==4 ? val : val*0x01010101; | |
| 1168 | 396 }else if(w==4 && h==2){ |
| 397 *(uint32_t*)(p + 0*stride)= | |
| 398 *(uint32_t*)(p + 1*stride)= size==4 ? val : val*0x01010101; | |
| 399 }else if(w==4 && h==4){ | |
| 400 *(uint32_t*)(p + 0*stride)= | |
| 401 *(uint32_t*)(p + 1*stride)= | |
| 402 *(uint32_t*)(p + 2*stride)= | |
| 403 *(uint32_t*)(p + 3*stride)= size==4 ? val : val*0x01010101; | |
| 404 }else if(w==8 && h==1){ | |
| 405 *(uint32_t*)(p + 0)= | |
| 406 *(uint32_t*)(p + 4)= size==4 ? val : val*0x01010101; | |
| 407 }else if(w==8 && h==2){ | |
| 408 *(uint32_t*)(p + 0 + 0*stride)= | |
| 409 *(uint32_t*)(p + 4 + 0*stride)= | |
| 410 *(uint32_t*)(p + 0 + 1*stride)= | |
| 411 *(uint32_t*)(p + 4 + 1*stride)= size==4 ? val : val*0x01010101; | |
| 412 }else if(w==8 && h==4){ | |
| 413 *(uint64_t*)(p + 0*stride)= | |
| 414 *(uint64_t*)(p + 1*stride)= | |
| 415 *(uint64_t*)(p + 2*stride)= | |
| 416 *(uint64_t*)(p + 3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
| 417 }else if(w==16 && h==2){ | |
| 418 *(uint64_t*)(p + 0+0*stride)= | |
| 419 *(uint64_t*)(p + 8+0*stride)= | |
| 420 *(uint64_t*)(p + 0+1*stride)= | |
| 421 *(uint64_t*)(p + 8+1*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
| 422 }else if(w==16 && h==4){ | |
| 423 *(uint64_t*)(p + 0+0*stride)= | |
| 424 *(uint64_t*)(p + 8+0*stride)= | |
| 425 *(uint64_t*)(p + 0+1*stride)= | |
| 426 *(uint64_t*)(p + 8+1*stride)= | |
| 427 *(uint64_t*)(p + 0+2*stride)= | |
| 428 *(uint64_t*)(p + 8+2*stride)= | |
| 429 *(uint64_t*)(p + 0+3*stride)= | |
| 430 *(uint64_t*)(p + 8+3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL; | |
| 431 }else | |
| 432 assert(0); | |
| 433 } | |
| 434 | |
| 2449 | 435 static inline void fill_caches(H264Context *h, int mb_type, int for_deblock){ |
| 1168 | 436 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
|
437 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 438 int topleft_xy, top_xy, topright_xy, left_xy[2]; |
| 439 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
|
440 int left_block[8]; |
| 1168 | 441 int i; |
| 442 | |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
443 //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
|
444 // 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
|
445 // 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
|
446 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
|
447 return; |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
448 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
449 //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 | 450 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
451 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
|
452 topleft_xy = top_xy - 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
453 topright_xy= top_xy + 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
454 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
|
455 left_block[0]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
456 left_block[1]= 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
457 left_block[2]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
458 left_block[3]= 3; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
459 left_block[4]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
460 left_block[5]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
461 left_block[6]= 8; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
462 left_block[7]= 11; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
463 if(h->mb_aff_frame){ |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
464 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
|
465 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
|
466 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
|
467 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
|
468 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
|
469 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
|
470 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
|
471 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
|
472 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
|
473 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
|
474 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
|
475 if (bottom |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
476 ? !curr_mb_frame_flag // bottom macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
477 : (!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
|
478 ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
479 top_xy -= s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
480 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
481 if (bottom |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
482 ? !curr_mb_frame_flag // bottom macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
483 : (!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
|
484 ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
485 topleft_xy -= s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
486 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
487 if (bottom |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
488 ? !curr_mb_frame_flag // bottom macroblock |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
489 : (!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
|
490 ) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
491 topright_xy -= s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
492 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
493 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
|
494 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
|
495 if (curr_mb_frame_flag) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
496 if (bottom) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
497 left_block[0]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
498 left_block[1]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
499 left_block[2]= 3; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
500 left_block[3]= 3; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
501 left_block[4]= 8; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
502 left_block[5]= 11; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
503 left_block[6]= 8; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
504 left_block[7]= 11; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
505 } else { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
506 left_block[0]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
507 left_block[1]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
508 left_block[2]= 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
509 left_block[3]= 1; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
510 left_block[4]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
511 left_block[5]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
512 left_block[6]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
513 left_block[7]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
514 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
515 } else { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
516 left_xy[1] += s->mb_stride; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
517 //left_block[0]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
518 left_block[1]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
519 left_block[2]= 0; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
520 left_block[3]= 2; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
521 //left_block[4]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
522 left_block[5]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
523 left_block[6]= 7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
524 left_block[7]= 10; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
525 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
526 } |
| 1168 | 527 } |
| 528 | |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
529 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
|
530 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
|
531 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
|
532 if(for_deblock){ |
| 2449 | 533 topleft_type = h->slice_table[topleft_xy ] < 255 ? s->current_picture.mb_type[topleft_xy] : 0; |
| 534 top_type = h->slice_table[top_xy ] < 255 ? s->current_picture.mb_type[top_xy] : 0; | |
| 535 topright_type= h->slice_table[topright_xy] < 255 ? s->current_picture.mb_type[topright_xy]: 0; | |
| 536 left_type[0] = h->slice_table[left_xy[0] ] < 255 ? s->current_picture.mb_type[left_xy[0]] : 0; | |
| 537 left_type[1] = h->slice_table[left_xy[1] ] < 255 ? s->current_picture.mb_type[left_xy[1]] : 0; | |
| 538 }else{ | |
| 539 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0; | |
| 540 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0; | |
| 541 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0; | |
| 542 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0; | |
| 543 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0; | |
| 544 } | |
| 1168 | 545 |
| 546 if(IS_INTRA(mb_type)){ | |
| 547 h->topleft_samples_available= | |
| 548 h->top_samples_available= | |
| 549 h->left_samples_available= 0xFFFF; | |
| 550 h->topright_samples_available= 0xEEEA; | |
| 551 | |
| 552 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){ | |
| 553 h->topleft_samples_available= 0xB3FF; | |
| 554 h->top_samples_available= 0x33FF; | |
| 555 h->topright_samples_available= 0x26EA; | |
| 556 } | |
| 557 for(i=0; i<2; i++){ | |
| 558 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){ | |
| 559 h->topleft_samples_available&= 0xDF5F; | |
| 560 h->left_samples_available&= 0x5F5F; | |
| 561 } | |
| 562 } | |
| 563 | |
| 564 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred)) | |
| 565 h->topleft_samples_available&= 0x7FFF; | |
| 566 | |
| 567 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred)) | |
| 568 h->topright_samples_available&= 0xFBFF; | |
| 569 | |
| 570 if(IS_INTRA4x4(mb_type)){ | |
| 571 if(IS_INTRA4x4(top_type)){ | |
| 572 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4]; | |
| 573 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5]; | |
| 574 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6]; | |
| 575 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3]; | |
| 576 }else{ | |
| 577 int pred; | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
578 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
|
579 pred= -1; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
580 else{ |
| 1168 | 581 pred= 2; |
| 582 } | |
| 583 h->intra4x4_pred_mode_cache[4+8*0]= | |
| 584 h->intra4x4_pred_mode_cache[5+8*0]= | |
| 585 h->intra4x4_pred_mode_cache[6+8*0]= | |
| 586 h->intra4x4_pred_mode_cache[7+8*0]= pred; | |
| 587 } | |
| 588 for(i=0; i<2; i++){ | |
| 589 if(IS_INTRA4x4(left_type[i])){ | |
| 590 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[0+2*i]]; | |
| 591 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[1+2*i]]; | |
| 592 }else{ | |
| 593 int pred; | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
594 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
|
595 pred= -1; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
596 else{ |
| 1168 | 597 pred= 2; |
| 598 } | |
| 599 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= | |
| 600 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred; | |
| 601 } | |
| 602 } | |
| 603 } | |
| 604 } | |
| 605 | |
| 606 | |
| 607 /* | |
| 608 0 . T T. T T T T | |
| 609 1 L . .L . . . . | |
| 610 2 L . .L . . . . | |
| 611 3 . T TL . . . . | |
| 612 4 L . .L . . . . | |
| 613 5 L . .. . . . . | |
| 614 */ | |
| 615 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec) | |
| 616 if(top_type){ | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
617 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
|
618 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
|
619 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
|
620 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3]; |
| 1168 | 621 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
622 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
|
623 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8]; |
| 1168 | 624 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
625 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
|
626 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11]; |
| 2314 | 627 |
| 1168 | 628 }else{ |
| 629 h->non_zero_count_cache[4+8*0]= | |
| 630 h->non_zero_count_cache[5+8*0]= | |
| 631 h->non_zero_count_cache[6+8*0]= | |
| 632 h->non_zero_count_cache[7+8*0]= | |
| 633 | |
| 634 h->non_zero_count_cache[1+8*0]= | |
| 635 h->non_zero_count_cache[2+8*0]= | |
| 636 | |
| 637 h->non_zero_count_cache[1+8*3]= | |
| 2314 | 638 h->non_zero_count_cache[2+8*3]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64; |
| 639 | |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
640 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
641 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
642 for (i=0; i<2; i++) { |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
643 if(left_type[i]){ |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
644 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
|
645 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
|
646 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
|
647 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
|
648 }else{ |
|
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*1 + 2*8*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[3+8*2 + 2*8*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*1 + 8*i]= |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
652 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
|
653 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
654 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
655 |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
656 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
|
657 // top_cbp |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
658 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
|
659 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
|
660 } 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
|
661 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
|
662 } else { |
|
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 = 0; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
664 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
665 // left_cbp |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
666 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
|
667 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
|
668 } 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
|
669 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
|
670 } else { |
|
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 = 0; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
672 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
673 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
|
674 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
|
675 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
676 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
|
677 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
|
678 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
679 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
680 |
| 1168 | 681 #if 1 |
| 2396 | 682 //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
|
683 if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){ |
| 1168 | 684 int list; |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
685 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
|
686 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !h->deblocking_filter){ |
| 1168 | 687 /*if(!h->mv_cache_clean[list]){ |
| 688 memset(h->mv_cache [list], 0, 8*5*2*sizeof(int16_t)); //FIXME clean only input? clean at all? | |
| 689 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t)); | |
| 690 h->mv_cache_clean[list]= 1; | |
| 691 }*/ | |
| 2396 | 692 continue; |
| 1168 | 693 } |
| 694 h->mv_cache_clean[list]= 0; | |
| 695 | |
| 696 if(IS_INTER(top_type)){ | |
| 697 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; | |
| 698 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride; | |
| 699 *(uint32_t*)h->mv_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 0]; | |
| 700 *(uint32_t*)h->mv_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 1]; | |
| 701 *(uint32_t*)h->mv_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 2]; | |
| 702 *(uint32_t*)h->mv_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 3]; | |
| 703 h->ref_cache[list][scan8[0] + 0 - 1*8]= | |
| 704 h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][b8_xy + 0]; | |
| 705 h->ref_cache[list][scan8[0] + 2 - 1*8]= | |
| 706 h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][b8_xy + 1]; | |
| 707 }else{ | |
| 708 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]= | |
| 709 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]= | |
| 710 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]= | |
| 711 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0; | |
| 712 *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101; | |
| 713 } | |
| 714 | |
| 715 //FIXME unify cleanup or sth | |
| 716 if(IS_INTER(left_type[0])){ | |
| 717 const int b_xy= h->mb2b_xy[left_xy[0]] + 3; | |
| 718 const int b8_xy= h->mb2b8_xy[left_xy[0]] + 1; | |
| 719 *(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]]; | |
| 720 *(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]]; | |
| 721 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
| 722 h->ref_cache[list][scan8[0] - 1 + 1*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0]>>1)]; | |
| 723 }else{ | |
| 724 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 0*8]= | |
| 725 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 1*8]= 0; | |
| 726 h->ref_cache[list][scan8[0] - 1 + 0*8]= | |
| 727 h->ref_cache[list][scan8[0] - 1 + 1*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
| 728 } | |
| 729 | |
| 730 if(IS_INTER(left_type[1])){ | |
| 731 const int b_xy= h->mb2b_xy[left_xy[1]] + 3; | |
| 732 const int b8_xy= h->mb2b8_xy[left_xy[1]] + 1; | |
| 733 *(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]]; | |
| 734 *(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]]; | |
| 735 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
| 736 h->ref_cache[list][scan8[0] - 1 + 3*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[2]>>1)]; | |
| 737 }else{ | |
| 738 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 2*8]= | |
| 739 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 3*8]= 0; | |
| 740 h->ref_cache[list][scan8[0] - 1 + 2*8]= | |
| 741 h->ref_cache[list][scan8[0] - 1 + 3*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; | |
| 2669 | 742 assert((!left_type[0]) == (!left_type[1])); |
| 1168 | 743 } |
| 744 | |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
745 if(for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)) |
| 2449 | 746 continue; |
| 747 | |
|
2623
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
748 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
|
749 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
|
750 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
|
751 *(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
|
752 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
|
753 }else{ |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
754 *(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
|
755 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
|
756 } |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
757 |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
758 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
|
759 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
|
760 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
|
761 *(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
|
762 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
|
763 }else{ |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
764 *(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
|
765 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
|
766 } |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
767 |
|
aaf8e94bce00
deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents:
2597
diff
changeset
|
768 |
| 1168 | 769 h->ref_cache[list][scan8[5 ]+1] = |
| 770 h->ref_cache[list][scan8[7 ]+1] = | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
771 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewhere else) |
| 1168 | 772 h->ref_cache[list][scan8[4 ]] = |
| 773 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; | |
| 774 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]= | |
| 775 *(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
|
776 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else) |
| 1168 | 777 *(uint32_t*)h->mv_cache [list][scan8[4 ]]= |
| 778 *(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
|
779 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
780 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
|
781 /* 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
|
782 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
|
783 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
|
784 *(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
|
785 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
786 *(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
|
787 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
788 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
789 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
|
790 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
|
791 *(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
|
792 *(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
|
793 *(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
|
794 *(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
|
795 }else{ |
|
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] + 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
|
797 *(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
|
798 *(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
|
799 *(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
|
800 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
801 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
|
802 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
|
803 *(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
|
804 *(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
|
805 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
806 *(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
|
807 *(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
|
808 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
809 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
|
810 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
|
811 *(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
|
812 *(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
|
813 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
814 *(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
|
815 *(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
|
816 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
817 *(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
|
818 *(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
|
819 *(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
|
820 *(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
|
821 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0; |
| 2396 | 822 |
| 823 if(h->slice_type == B_TYPE){ | |
| 824 fill_rectangle(&h->direct_cache[scan8[0]], 4, 4, 8, 0, 1); | |
| 825 | |
| 826 if(IS_DIRECT(top_type)){ | |
| 827 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101; | |
| 828 }else if(IS_8X8(top_type)){ | |
| 829 int b8_xy = h->mb2b8_xy[top_xy] + h->b8_stride; | |
| 830 h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy]; | |
| 831 h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 1]; | |
| 832 }else{ | |
| 833 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0; | |
| 834 } | |
| 835 | |
| 836 //FIXME interlacing | |
| 837 if(IS_DIRECT(left_type[0])){ | |
| 838 h->direct_cache[scan8[0] - 1 + 0*8]= | |
| 839 h->direct_cache[scan8[0] - 1 + 2*8]= 1; | |
| 840 }else if(IS_8X8(left_type[0])){ | |
| 841 int b8_xy = h->mb2b8_xy[left_xy[0]] + 1; | |
| 842 h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[b8_xy]; | |
| 843 h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[b8_xy + h->b8_stride]; | |
| 844 }else{ | |
| 845 h->direct_cache[scan8[0] - 1 + 0*8]= | |
| 846 h->direct_cache[scan8[0] - 1 + 2*8]= 0; | |
| 847 } | |
| 848 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
849 } |
| 1168 | 850 } |
| 851 } | |
| 852 #endif | |
| 2755 | 853 |
| 854 h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]); | |
| 1168 | 855 } |
| 856 | |
| 857 static inline void write_back_intra_pred_mode(H264Context *h){ | |
| 858 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
|
859 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 860 |
| 861 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1]; | |
| 862 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2]; | |
| 863 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3]; | |
| 864 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4]; | |
| 865 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4]; | |
| 866 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4]; | |
| 867 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4]; | |
| 868 } | |
| 869 | |
| 870 /** | |
| 871 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
| 872 */ | |
| 873 static inline int check_intra4x4_pred_mode(H264Context *h){ | |
| 874 MpegEncContext * const s = &h->s; | |
| 875 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0}; | |
| 876 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED}; | |
| 877 int i; | |
| 878 | |
| 879 if(!(h->top_samples_available&0x8000)){ | |
| 880 for(i=0; i<4; i++){ | |
| 881 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ]; | |
| 882 if(status<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
883 av_log(h->s.avctx, AV_LOG_ERROR, "top block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y); |
| 1168 | 884 return -1; |
| 885 } else if(status){ | |
| 886 h->intra4x4_pred_mode_cache[scan8[0] + i]= status; | |
| 887 } | |
| 888 } | |
| 889 } | |
| 890 | |
| 891 if(!(h->left_samples_available&0x8000)){ | |
| 892 for(i=0; i<4; i++){ | |
| 893 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ]; | |
| 894 if(status<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
895 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 | 896 return -1; |
| 897 } else if(status){ | |
| 898 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status; | |
| 899 } | |
| 900 } | |
| 901 } | |
| 902 | |
| 903 return 0; | |
| 904 } //FIXME cleanup like next | |
| 905 | |
| 906 /** | |
| 907 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks. | |
| 908 */ | |
| 909 static inline int check_intra_pred_mode(H264Context *h, int mode){ | |
| 910 MpegEncContext * const s = &h->s; | |
| 911 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1}; | |
| 912 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8}; | |
| 913 | |
| 2392 | 914 if(mode < 0 || mode > 6) { |
| 915 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 | 916 return -1; |
| 2392 | 917 } |
| 2163 | 918 |
| 1168 | 919 if(!(h->top_samples_available&0x8000)){ |
| 920 mode= top[ mode ]; | |
| 921 if(mode<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
922 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 | 923 return -1; |
| 924 } | |
| 925 } | |
| 926 | |
| 927 if(!(h->left_samples_available&0x8000)){ | |
| 928 mode= left[ mode ]; | |
| 929 if(mode<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
930 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 | 931 return -1; |
| 932 } | |
| 933 } | |
| 934 | |
| 935 return mode; | |
| 936 } | |
| 937 | |
| 938 /** | |
| 939 * gets the predicted intra4x4 prediction mode. | |
| 940 */ | |
| 941 static inline int pred_intra_mode(H264Context *h, int n){ | |
| 942 const int index8= scan8[n]; | |
| 943 const int left= h->intra4x4_pred_mode_cache[index8 - 1]; | |
| 944 const int top = h->intra4x4_pred_mode_cache[index8 - 8]; | |
| 945 const int min= FFMIN(left, top); | |
| 946 | |
| 1170 | 947 tprintf("mode:%d %d min:%d\n", left ,top, min); |
| 1168 | 948 |
| 949 if(min<0) return DC_PRED; | |
| 950 else return min; | |
| 951 } | |
| 952 | |
| 953 static inline void write_back_non_zero_count(H264Context *h){ | |
| 954 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
|
955 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
|
956 |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
957 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
|
958 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
|
959 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
|
960 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
|
961 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
|
962 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
|
963 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
|
964 |
|
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][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
|
966 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
|
967 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
|
968 |
|
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][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
|
970 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
|
971 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[2+8*4]; |
| 1168 | 972 } |
| 973 | |
| 974 /** | |
| 975 * gets the predicted number of non zero coefficients. | |
| 976 * @param n block index | |
| 977 */ | |
| 978 static inline int pred_non_zero_count(H264Context *h, int n){ | |
| 979 const int index8= scan8[n]; | |
| 980 const int left= h->non_zero_count_cache[index8 - 1]; | |
| 981 const int top = h->non_zero_count_cache[index8 - 8]; | |
| 982 int i= left + top; | |
| 983 | |
| 984 if(i<64) i= (i+1)>>1; | |
| 985 | |
| 1170 | 986 tprintf("pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31); |
| 1168 | 987 |
| 988 return i&31; | |
| 989 } | |
| 990 | |
| 1169 | 991 static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width){ |
| 992 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ]; | |
| 993 | |
| 994 if(topright_ref != PART_NOT_AVAILABLE){ | |
| 995 *C= h->mv_cache[list][ i - 8 + part_width ]; | |
| 996 return topright_ref; | |
| 997 }else{ | |
| 1170 | 998 tprintf("topright MV not available\n"); |
| 999 | |
| 1169 | 1000 *C= h->mv_cache[list][ i - 8 - 1 ]; |
| 1001 return h->ref_cache[list][ i - 8 - 1 ]; | |
| 1002 } | |
| 1003 } | |
| 1004 | |
| 1168 | 1005 /** |
| 1006 * gets the predicted MV. | |
| 1007 * @param n the block index | |
| 1008 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4) | |
| 1009 * @param mx the x component of the predicted motion vector | |
| 1010 * @param my the y component of the predicted motion vector | |
| 1011 */ | |
| 1012 static inline void pred_motion(H264Context * const h, int n, int part_width, int list, int ref, int * const mx, int * const my){ | |
| 1013 const int index8= scan8[n]; | |
| 1014 const int top_ref= h->ref_cache[list][ index8 - 8 ]; | |
| 1015 const int left_ref= h->ref_cache[list][ index8 - 1 ]; | |
| 1016 const int16_t * const A= h->mv_cache[list][ index8 - 1 ]; | |
| 1017 const int16_t * const B= h->mv_cache[list][ index8 - 8 ]; | |
| 1169 | 1018 const int16_t * C; |
| 1019 int diagonal_ref, match_count; | |
| 1020 | |
| 1168 | 1021 assert(part_width==1 || part_width==2 || part_width==4); |
| 1169 | 1022 |
| 1168 | 1023 /* mv_cache |
| 1024 B . . A T T T T | |
| 1025 U . . L . . , . | |
| 1026 U . . L . . . . | |
| 1027 U . . L . . , . | |
| 1028 . . . L . . . . | |
| 1029 */ | |
| 1169 | 1030 |
| 1031 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width); | |
| 1032 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
|
1033 tprintf("pred_motion match_count=%d\n", match_count); |
| 1169 | 1034 if(match_count > 1){ //most common |
| 1035 *mx= mid_pred(A[0], B[0], C[0]); | |
| 1036 *my= mid_pred(A[1], B[1], C[1]); | |
| 1037 }else if(match_count==1){ | |
| 1038 if(left_ref==ref){ | |
| 1039 *mx= A[0]; | |
| 1040 *my= A[1]; | |
| 1041 }else if(top_ref==ref){ | |
| 1042 *mx= B[0]; | |
| 1043 *my= B[1]; | |
| 1044 }else{ | |
| 1045 *mx= C[0]; | |
| 1046 *my= C[1]; | |
| 1047 } | |
| 1048 }else{ | |
| 1049 if(top_ref == PART_NOT_AVAILABLE && diagonal_ref == PART_NOT_AVAILABLE && left_ref != PART_NOT_AVAILABLE){ | |
| 1050 *mx= A[0]; | |
| 1051 *my= A[1]; | |
| 1168 | 1052 }else{ |
| 1053 *mx= mid_pred(A[0], B[0], C[0]); | |
| 1054 *my= mid_pred(A[1], B[1], C[1]); | |
| 1055 } | |
| 1169 | 1056 } |
| 1168 | 1057 |
| 1187 | 1058 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 | 1059 } |
| 1060 | |
| 1061 /** | |
| 1062 * gets the directionally predicted 16x8 MV. | |
| 1063 * @param n the block index | |
| 1064 * @param mx the x component of the predicted motion vector | |
| 1065 * @param my the y component of the predicted motion vector | |
| 1066 */ | |
| 1067 static inline void pred_16x8_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
| 1068 if(n==0){ | |
| 1069 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ]; | |
| 1070 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ]; | |
| 1071 | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1072 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 | 1073 |
| 1074 if(top_ref == ref){ | |
| 1075 *mx= B[0]; | |
| 1076 *my= B[1]; | |
| 1077 return; | |
| 1078 } | |
| 1079 }else{ | |
| 1080 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ]; | |
| 1081 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ]; | |
| 1082 | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1083 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 | 1084 |
| 1085 if(left_ref == ref){ | |
| 1086 *mx= A[0]; | |
| 1087 *my= A[1]; | |
| 1088 return; | |
| 1089 } | |
| 1090 } | |
| 1091 | |
| 1092 //RARE | |
| 1093 pred_motion(h, n, 4, list, ref, mx, my); | |
| 1094 } | |
| 1095 | |
| 1096 /** | |
| 1097 * gets the directionally predicted 8x16 MV. | |
| 1098 * @param n the block index | |
| 1099 * @param mx the x component of the predicted motion vector | |
| 1100 * @param my the y component of the predicted motion vector | |
| 1101 */ | |
| 1102 static inline void pred_8x16_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){ | |
| 1103 if(n==0){ | |
| 1104 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ]; | |
| 1105 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ]; | |
| 1106 | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1107 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 | 1108 |
| 1109 if(left_ref == ref){ | |
| 1110 *mx= A[0]; | |
| 1111 *my= A[1]; | |
| 1112 return; | |
| 1113 } | |
| 1114 }else{ | |
| 1169 | 1115 const int16_t * C; |
| 1116 int diagonal_ref; | |
| 1117 | |
| 1118 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2); | |
| 1168 | 1119 |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
1120 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 | 1121 |
| 1169 | 1122 if(diagonal_ref == ref){ |
| 1168 | 1123 *mx= C[0]; |
| 1124 *my= C[1]; | |
| 1125 return; | |
| 1126 } | |
| 1127 } | |
| 1128 | |
| 1129 //RARE | |
| 1130 pred_motion(h, n, 2, list, ref, mx, my); | |
| 1131 } | |
| 1132 | |
| 1133 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){ | |
| 1134 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ]; | |
| 1135 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ]; | |
| 1136 | |
| 2392 | 1137 tprintf("pred_pskip: (%d) (%d) at %2d %2d\n", top_ref, left_ref, h->s.mb_x, h->s.mb_y); |
| 1168 | 1138 |
| 1139 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE | |
| 1140 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0) | |
| 1141 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){ | |
| 1142 | |
| 1143 *mx = *my = 0; | |
| 1144 return; | |
| 1145 } | |
| 1146 | |
| 1147 pred_motion(h, 0, 4, 0, 0, mx, my); | |
| 1148 | |
| 1149 return; | |
| 1150 } | |
| 1151 | |
| 2396 | 1152 static inline void direct_dist_scale_factor(H264Context * const h){ |
| 1153 const int poc = h->s.current_picture_ptr->poc; | |
| 1154 const int poc1 = h->ref_list[1][0].poc; | |
| 1155 int i; | |
| 1156 for(i=0; i<h->ref_count[0]; i++){ | |
| 1157 int poc0 = h->ref_list[0][i].poc; | |
| 1158 int td = clip(poc1 - poc0, -128, 127); | |
| 1159 if(td == 0 /* FIXME || pic0 is a long-term ref */){ | |
| 1160 h->dist_scale_factor[i] = 256; | |
| 1161 }else{ | |
| 1162 int tb = clip(poc - poc0, -128, 127); | |
| 1163 int tx = (16384 + (ABS(td) >> 1)) / td; | |
| 1164 h->dist_scale_factor[i] = clip((tb*tx + 32) >> 6, -1024, 1023); | |
| 1165 } | |
| 1166 } | |
| 1167 } | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1168 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
|
1169 MpegEncContext * const s = &h->s; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1170 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
|
1171 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
|
1172 int list, i, j; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1173 if(cur->pict_type == I_TYPE) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1174 cur->ref_count[0] = 0; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1175 if(cur->pict_type != B_TYPE) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1176 cur->ref_count[1] = 0; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1177 for(list=0; list<2; list++){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1178 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
|
1179 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
|
1180 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
|
1181 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1182 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
|
1183 return; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1184 for(list=0; list<2; list++){ |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1185 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
|
1186 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
|
1187 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
|
1188 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
|
1189 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
|
1190 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
|
1191 break; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1192 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1193 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1194 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1195 } |
| 2396 | 1196 |
| 1197 static inline void pred_direct_motion(H264Context * const h, int *mb_type){ | |
| 1198 MpegEncContext * const s = &h->s; | |
| 1199 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride; | |
| 1200 const int b8_xy = 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
| 1201 const int b4_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
| 1202 const int mb_type_col = h->ref_list[1][0].mb_type[mb_xy]; | |
| 1203 const int16_t (*l1mv0)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[0][b4_xy]; | |
| 1204 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
|
1205 const int8_t *l1ref1 = &h->ref_list[1][0].ref_index[1][b8_xy]; |
| 2396 | 1206 const int is_b8x8 = IS_8X8(*mb_type); |
| 1207 int sub_mb_type; | |
| 1208 int i8, i4; | |
| 1209 | |
| 1210 if(IS_8X8(mb_type_col) && !h->sps.direct_8x8_inference_flag){ | |
| 1211 /* FIXME save sub mb types from previous frames (or derive from MVs) | |
| 1212 * so we know exactly what block size to use */ | |
| 1213 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */ | |
| 2536 | 1214 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
| 2396 | 1215 }else if(!is_b8x8 && (IS_16X16(mb_type_col) || IS_INTRA(mb_type_col))){ |
| 1216 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ | |
| 1217 *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */ | |
| 1218 }else{ | |
| 1219 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ | |
| 2536 | 1220 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1; |
| 2396 | 1221 } |
| 1222 if(!is_b8x8) | |
| 1223 *mb_type |= MB_TYPE_DIRECT2; | |
| 1224 | |
|
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
|
1225 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
|
1226 |
| 2396 | 1227 if(h->direct_spatial_mv_pred){ |
| 1228 int ref[2]; | |
| 1229 int mv[2][2]; | |
| 1230 int list; | |
| 1231 | |
| 1232 /* ref = min(neighbors) */ | |
| 1233 for(list=0; list<2; list++){ | |
| 1234 int refa = h->ref_cache[list][scan8[0] - 1]; | |
| 1235 int refb = h->ref_cache[list][scan8[0] - 8]; | |
| 1236 int refc = h->ref_cache[list][scan8[0] - 8 + 4]; | |
| 1237 if(refc == -2) | |
| 1238 refc = h->ref_cache[list][scan8[0] - 8 - 1]; | |
| 1239 ref[list] = refa; | |
| 1240 if(ref[list] < 0 || (refb < ref[list] && refb >= 0)) | |
| 1241 ref[list] = refb; | |
| 1242 if(ref[list] < 0 || (refc < ref[list] && refc >= 0)) | |
| 1243 ref[list] = refc; | |
| 1244 if(ref[list] < 0) | |
| 1245 ref[list] = -1; | |
| 1246 } | |
| 1247 | |
| 1248 if(ref[0] < 0 && ref[1] < 0){ | |
| 1249 ref[0] = ref[1] = 0; | |
| 1250 mv[0][0] = mv[0][1] = | |
| 1251 mv[1][0] = mv[1][1] = 0; | |
| 1252 }else{ | |
| 1253 for(list=0; list<2; list++){ | |
| 1254 if(ref[list] >= 0) | |
| 1255 pred_motion(h, 0, 4, list, ref[list], &mv[list][0], &mv[list][1]); | |
| 1256 else | |
| 1257 mv[list][0] = mv[list][1] = 0; | |
| 1258 } | |
| 1259 } | |
| 1260 | |
| 1261 if(ref[1] < 0){ | |
| 1262 *mb_type &= ~MB_TYPE_P0L1; | |
| 1263 sub_mb_type &= ~MB_TYPE_P0L1; | |
| 1264 }else if(ref[0] < 0){ | |
| 1265 *mb_type &= ~MB_TYPE_P0L0; | |
| 1266 sub_mb_type &= ~MB_TYPE_P0L0; | |
| 1267 } | |
| 1268 | |
| 1269 if(IS_16X16(*mb_type)){ | |
| 1270 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref[0], 1); | |
| 1271 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, ref[1], 1); | |
| 1272 if(!IS_INTRA(mb_type_col) && l1ref0[0] == 0 && | |
| 1273 ABS(l1mv0[0][0]) <= 1 && ABS(l1mv0[0][1]) <= 1){ | |
| 1274 if(ref[0] > 0) | |
| 1275 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
| 1276 else | |
| 1277 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 1278 if(ref[1] > 0) | |
| 1279 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
| 1280 else | |
| 1281 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 1282 }else{ | |
| 1283 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
| 1284 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
| 1285 } | |
| 1286 }else{ | |
| 1287 for(i8=0; i8<4; i8++){ | |
| 1288 const int x8 = i8&1; | |
| 1289 const int y8 = i8>>1; | |
| 1290 | |
| 1291 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
| 1292 continue; | |
| 1293 h->sub_mb_type[i8] = sub_mb_type; | |
| 1294 | |
| 1295 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mv[0][0],mv[0][1]), 4); | |
| 1296 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mv[1][0],mv[1][1]), 4); | |
| 1297 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref[0], 1); | |
| 1298 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, ref[1], 1); | |
| 1299 | |
| 1300 /* col_zero_flag */ | |
| 1301 if(!IS_INTRA(mb_type_col) && l1ref0[x8 + y8*h->b8_stride] == 0){ | |
| 1302 for(i4=0; i4<4; i4++){ | |
| 1303 const int16_t *mv_col = l1mv0[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; | |
| 1304 if(ABS(mv_col[0]) <= 1 && ABS(mv_col[1]) <= 1){ | |
| 1305 if(ref[0] == 0) | |
| 1306 *(uint32_t*)h->mv_cache[0][scan8[i8*4+i4]] = 0; | |
| 1307 if(ref[1] == 0) | |
| 1308 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = 0; | |
| 1309 } | |
| 1310 } | |
| 1311 } | |
| 1312 } | |
| 1313 } | |
| 1314 }else{ /* direct temporal mv pred */ | |
| 1315 if(IS_16X16(*mb_type)){ | |
| 1316 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, 0, 1); | |
| 1317 if(IS_INTRA(mb_type_col)){ | |
| 1318 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
| 1319 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 1320 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 1321 }else{ | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1322 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
|
1323 : h->map_col_to_list0[1][l1ref1[0]]; |
| 2396 | 1324 const int dist_scale_factor = h->dist_scale_factor[ref0]; |
| 1325 const int16_t *mv_col = l1mv0[0]; | |
| 1326 int mv_l0[2]; | |
| 1327 mv_l0[0] = (dist_scale_factor * mv_col[0] + 128) >> 8; | |
| 1328 mv_l0[1] = (dist_scale_factor * mv_col[1] + 128) >> 8; | |
| 1329 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref0, 1); | |
| 1330 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv_l0[0],mv_l0[1]), 4); | |
| 1331 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); | |
| 1332 } | |
| 1333 }else{ | |
| 1334 for(i8=0; i8<4; i8++){ | |
| 1335 const int x8 = i8&1; | |
| 1336 const int y8 = i8>>1; | |
| 1337 int ref0, dist_scale_factor; | |
| 1338 | |
| 1339 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8])) | |
| 1340 continue; | |
| 1341 h->sub_mb_type[i8] = sub_mb_type; | |
| 1342 if(IS_INTRA(mb_type_col)){ | |
| 1343 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1); | |
| 1344 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); | |
| 1345 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4); | |
| 1346 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4); | |
| 1347 continue; | |
| 1348 } | |
| 1349 | |
| 1350 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
|
1351 if(ref0 >= 0) |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1352 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
|
1353 else |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
1354 ref0 = h->map_col_to_list0[1][l1ref1[x8 + y8*h->b8_stride]]; |
| 2396 | 1355 dist_scale_factor = h->dist_scale_factor[ref0]; |
| 1356 | |
| 1357 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1); | |
| 1358 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); | |
| 1359 for(i4=0; i4<4; i4++){ | |
| 1360 const int16_t *mv_col = l1mv0[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride]; | |
| 1361 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]]; | |
| 1362 mv_l0[0] = (dist_scale_factor * mv_col[0] + 128) >> 8; | |
| 1363 mv_l0[1] = (dist_scale_factor * mv_col[1] + 128) >> 8; | |
| 1364 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = | |
| 1365 pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]); | |
| 1366 } | |
| 1367 } | |
| 1368 } | |
| 1369 } | |
| 1370 } | |
| 1371 | |
| 1168 | 1372 static inline void write_back_motion(H264Context *h, int mb_type){ |
| 1373 MpegEncContext * const s = &h->s; | |
| 1374 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; | |
| 1375 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride; | |
| 1376 int list; | |
| 1377 | |
| 1378 for(list=0; list<2; list++){ | |
| 1379 int y; | |
| 2535 | 1380 if(!USES_LIST(mb_type, list)){ |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
1381 if(1){ //FIXME skip or never read if mb_type doesn't use it |
| 1168 | 1382 for(y=0; y<4; y++){ |
| 1383 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]= | |
| 1384 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= 0; | |
| 1385 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1386 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
|
1387 /* FIXME needed ? */ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1388 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
|
1389 *(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
|
1390 *(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
|
1391 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1392 } |
| 1168 | 1393 for(y=0; y<2; y++){ |
|
2675
c6aa5585954f
alignment fix by (G?bor Kov?cs >picard demoscene hu)
michael
parents:
2674
diff
changeset
|
1394 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
|
1395 s->current_picture.ref_index[list][b8_xy + 1 + y*h->b8_stride]= LIST_NOT_USED; |
| 1168 | 1396 } |
| 1397 } | |
| 2396 | 1398 continue; |
| 1168 | 1399 } |
| 1400 | |
| 1401 for(y=0; y<4; y++){ | |
| 1402 *(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]; | |
| 1403 *(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]; | |
| 1404 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1405 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
|
1406 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
|
1407 *(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
|
1408 *(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
|
1409 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
1410 } |
| 1168 | 1411 for(y=0; y<2; y++){ |
| 1412 s->current_picture.ref_index[list][b8_xy + 0 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+0 + 16*y]; | |
| 1413 s->current_picture.ref_index[list][b8_xy + 1 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+2 + 16*y]; | |
| 1414 } | |
| 1415 } | |
| 2396 | 1416 |
| 1417 if(h->slice_type == B_TYPE && h->pps.cabac){ | |
| 1418 if(IS_8X8(mb_type)){ | |
| 1419 h->direct_table[b8_xy+1+0*h->b8_stride] = IS_DIRECT(h->sub_mb_type[1]) ? 1 : 0; | |
| 1420 h->direct_table[b8_xy+0+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[2]) ? 1 : 0; | |
| 1421 h->direct_table[b8_xy+1+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[3]) ? 1 : 0; | |
| 1422 } | |
| 1423 } | |
| 1168 | 1424 } |
| 1425 | |
| 1426 /** | |
| 1427 * Decodes a network abstraction layer unit. | |
| 1428 * @param consumed is the number of bytes used as input | |
| 1429 * @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
|
1430 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing? |
| 1168 | 1431 * @returns decoded bytes, might be src+1 if no escapes |
| 1432 */ | |
| 1433 static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *consumed, int length){ | |
| 1434 int i, si, di; | |
| 1435 uint8_t *dst; | |
| 1436 | |
| 1437 // src[0]&0x80; //forbidden bit | |
| 1438 h->nal_ref_idc= src[0]>>5; | |
| 1439 h->nal_unit_type= src[0]&0x1F; | |
| 1440 | |
| 1441 src++; length--; | |
| 1442 #if 0 | |
| 1443 for(i=0; i<length; i++) | |
| 1444 printf("%2X ", src[i]); | |
| 1445 #endif | |
| 1446 for(i=0; i+1<length; i+=2){ | |
| 1447 if(src[i]) continue; | |
| 1448 if(i>0 && src[i-1]==0) i--; | |
| 1449 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
| 1450 if(src[i+2]!=3){ | |
| 1451 /* startcode, so we must be past the end */ | |
| 1452 length=i; | |
| 1453 } | |
| 1454 break; | |
| 1455 } | |
| 1456 } | |
| 1457 | |
| 1458 if(i>=length-1){ //no escaped 0 | |
| 1459 *dst_length= length; | |
| 1460 *consumed= length+1; //+1 for the header | |
| 1461 return src; | |
| 1462 } | |
| 1463 | |
| 1464 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length); | |
| 1465 dst= h->rbsp_buffer; | |
| 1466 | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
1467 //printf("decoding esc\n"); |
| 1168 | 1468 si=di=0; |
| 1469 while(si<length){ | |
| 1470 //remove escapes (very rare 1:2^22) | |
| 1471 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
| 1472 if(src[si+2]==3){ //escape | |
| 1473 dst[di++]= 0; | |
| 1474 dst[di++]= 0; | |
| 1475 si+=3; | |
|
1957
54411768fa38
h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1956
diff
changeset
|
1476 continue; |
| 1168 | 1477 }else //next start code |
| 1478 break; | |
| 1479 } | |
| 1480 | |
| 1481 dst[di++]= src[si++]; | |
| 1482 } | |
| 1483 | |
| 1484 *dst_length= di; | |
| 1485 *consumed= si + 1;//+1 for the header | |
| 1486 //FIXME store exact number of bits in the getbitcontext (its needed for decoding) | |
| 1487 return dst; | |
| 1488 } | |
| 1489 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1490 #if 0 |
| 1168 | 1491 /** |
| 1492 * @param src the data which should be escaped | |
| 1493 * @param dst the target buffer, dst+1 == src is allowed as a special case | |
| 1494 * @param length the length of the src data | |
| 1495 * @param dst_length the length of the dst array | |
| 1496 * @returns length of escaped data in bytes or -1 if an error occured | |
| 1497 */ | |
| 1498 static int encode_nal(H264Context *h, uint8_t *dst, uint8_t *src, int length, int dst_length){ | |
| 1499 int i, escape_count, si, di; | |
| 1500 uint8_t *temp; | |
| 1501 | |
| 1502 assert(length>=0); | |
| 1503 assert(dst_length>0); | |
| 1504 | |
| 1505 dst[0]= (h->nal_ref_idc<<5) + h->nal_unit_type; | |
| 1506 | |
| 1507 if(length==0) return 1; | |
| 1508 | |
| 1509 escape_count= 0; | |
| 1510 for(i=0; i<length; i+=2){ | |
| 1511 if(src[i]) continue; | |
| 1512 if(i>0 && src[i-1]==0) | |
| 1513 i--; | |
| 1514 if(i+2<length && src[i+1]==0 && src[i+2]<=3){ | |
| 1515 escape_count++; | |
| 1516 i+=2; | |
| 1517 } | |
| 1518 } | |
| 1519 | |
| 1520 if(escape_count==0){ | |
| 1521 if(dst+1 != src) | |
| 1522 memcpy(dst+1, src, length); | |
| 1523 return length + 1; | |
| 1524 } | |
| 1525 | |
| 1526 if(length + escape_count + 1> dst_length) | |
| 1527 return -1; | |
| 1528 | |
| 1529 //this should be damn rare (hopefully) | |
| 1530 | |
| 1531 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length + escape_count); | |
| 1532 temp= h->rbsp_buffer; | |
| 1533 //printf("encoding esc\n"); | |
| 1534 | |
| 1535 si= 0; | |
| 1536 di= 0; | |
| 1537 while(si < length){ | |
| 1538 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){ | |
| 1539 temp[di++]= 0; si++; | |
| 1540 temp[di++]= 0; si++; | |
| 1541 temp[di++]= 3; | |
| 1542 temp[di++]= src[si++]; | |
| 1543 } | |
| 1544 else | |
| 1545 temp[di++]= src[si++]; | |
| 1546 } | |
| 1547 memcpy(dst+1, temp, length+escape_count); | |
| 1548 | |
| 1549 assert(di == length+escape_count); | |
| 1550 | |
| 1551 return di + 1; | |
| 1552 } | |
| 1553 | |
| 1554 /** | |
| 1555 * write 1,10,100,1000,... for alignment, yes its exactly inverse to mpeg4 | |
| 1556 */ | |
| 1557 static void encode_rbsp_trailing(PutBitContext *pb){ | |
| 1558 int length; | |
| 1559 put_bits(pb, 1, 1); | |
| 1786 | 1560 length= (-put_bits_count(pb))&7; |
| 1168 | 1561 if(length) put_bits(pb, length, 0); |
| 1562 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1563 #endif |
| 1168 | 1564 |
| 1565 /** | |
| 1566 * identifies the exact end of the bitstream | |
| 1567 * @return the length of the trailing, or 0 if damaged | |
| 1568 */ | |
| 1569 static int decode_rbsp_trailing(uint8_t *src){ | |
| 1570 int v= *src; | |
| 1571 int r; | |
| 1572 | |
| 1170 | 1573 tprintf("rbsp trailing %X\n", v); |
| 1168 | 1574 |
| 1575 for(r=1; r<9; r++){ | |
| 1576 if(v&1) return r; | |
| 1577 v>>=1; | |
| 1578 } | |
| 1579 return 0; | |
| 1580 } | |
| 1581 | |
| 1582 /** | |
| 1583 * idct tranforms the 16 dc values and dequantize them. | |
| 1584 * @param qp quantization parameter | |
| 1585 */ | |
| 1586 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
| 1587 const int qmul= dequant_coeff[qp][0]; | |
| 1588 #define stride 16 | |
| 1589 int i; | |
| 1590 int temp[16]; //FIXME check if this is a good idea | |
| 1591 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
| 1592 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
| 1593 | |
| 1594 //memset(block, 64, 2*256); | |
| 1595 //return; | |
| 1596 for(i=0; i<4; i++){ | |
| 1597 const int offset= y_offset[i]; | |
| 1598 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
| 1599 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
| 1600 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
| 1601 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
| 1602 | |
| 1603 temp[4*i+0]= z0+z3; | |
| 1604 temp[4*i+1]= z1+z2; | |
| 1605 temp[4*i+2]= z1-z2; | |
| 1606 temp[4*i+3]= z0-z3; | |
| 1607 } | |
| 1608 | |
| 1609 for(i=0; i<4; i++){ | |
| 1610 const int offset= x_offset[i]; | |
| 1611 const int z0= temp[4*0+i] + temp[4*2+i]; | |
| 1612 const int z1= temp[4*0+i] - temp[4*2+i]; | |
| 1613 const int z2= temp[4*1+i] - temp[4*3+i]; | |
| 1614 const int z3= temp[4*1+i] + temp[4*3+i]; | |
| 1615 | |
| 1616 block[stride*0 +offset]= ((z0 + z3)*qmul + 2)>>2; //FIXME think about merging this into decode_resdual | |
| 1617 block[stride*2 +offset]= ((z1 + z2)*qmul + 2)>>2; | |
| 1618 block[stride*8 +offset]= ((z1 - z2)*qmul + 2)>>2; | |
| 1619 block[stride*10+offset]= ((z0 - z3)*qmul + 2)>>2; | |
| 1620 } | |
| 1621 } | |
| 1622 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1623 #if 0 |
| 1168 | 1624 /** |
| 1625 * dct tranforms the 16 dc values. | |
| 1626 * @param qp quantization parameter ??? FIXME | |
| 1627 */ | |
| 1628 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){ | |
| 1629 // const int qmul= dequant_coeff[qp][0]; | |
| 1630 int i; | |
| 1631 int temp[16]; //FIXME check if this is a good idea | |
| 1632 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; | |
| 1633 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; | |
| 1634 | |
| 1635 for(i=0; i<4; i++){ | |
| 1636 const int offset= y_offset[i]; | |
| 1637 const int z0= block[offset+stride*0] + block[offset+stride*4]; | |
| 1638 const int z1= block[offset+stride*0] - block[offset+stride*4]; | |
| 1639 const int z2= block[offset+stride*1] - block[offset+stride*5]; | |
| 1640 const int z3= block[offset+stride*1] + block[offset+stride*5]; | |
| 1641 | |
| 1642 temp[4*i+0]= z0+z3; | |
| 1643 temp[4*i+1]= z1+z2; | |
| 1644 temp[4*i+2]= z1-z2; | |
| 1645 temp[4*i+3]= z0-z3; | |
| 1646 } | |
| 1647 | |
| 1648 for(i=0; i<4; i++){ | |
| 1649 const int offset= x_offset[i]; | |
| 1650 const int z0= temp[4*0+i] + temp[4*2+i]; | |
| 1651 const int z1= temp[4*0+i] - temp[4*2+i]; | |
| 1652 const int z2= temp[4*1+i] - temp[4*3+i]; | |
| 1653 const int z3= temp[4*1+i] + temp[4*3+i]; | |
| 1654 | |
| 1655 block[stride*0 +offset]= (z0 + z3)>>1; | |
| 1656 block[stride*2 +offset]= (z1 + z2)>>1; | |
| 1657 block[stride*8 +offset]= (z1 - z2)>>1; | |
| 1658 block[stride*10+offset]= (z0 - z3)>>1; | |
| 1659 } | |
| 1660 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1661 #endif |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1662 |
| 1168 | 1663 #undef xStride |
| 1664 #undef stride | |
| 1665 | |
| 1666 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp){ | |
| 1667 const int qmul= dequant_coeff[qp][0]; | |
| 1668 const int stride= 16*2; | |
| 1669 const int xStride= 16; | |
| 1670 int a,b,c,d,e; | |
| 1671 | |
| 1672 a= block[stride*0 + xStride*0]; | |
| 1673 b= block[stride*0 + xStride*1]; | |
| 1674 c= block[stride*1 + xStride*0]; | |
| 1675 d= block[stride*1 + xStride*1]; | |
| 1676 | |
| 1677 e= a-b; | |
| 1678 a= a+b; | |
| 1679 b= c-d; | |
| 1680 c= c+d; | |
| 1681 | |
| 1682 block[stride*0 + xStride*0]= ((a+c)*qmul + 0)>>1; | |
| 1683 block[stride*0 + xStride*1]= ((e+b)*qmul + 0)>>1; | |
| 1684 block[stride*1 + xStride*0]= ((a-c)*qmul + 0)>>1; | |
| 1685 block[stride*1 + xStride*1]= ((e-b)*qmul + 0)>>1; | |
| 1686 } | |
| 1687 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1688 #if 0 |
| 1168 | 1689 static void chroma_dc_dct_c(DCTELEM *block){ |
| 1690 const int stride= 16*2; | |
| 1691 const int xStride= 16; | |
| 1692 int a,b,c,d,e; | |
| 1693 | |
| 1694 a= block[stride*0 + xStride*0]; | |
| 1695 b= block[stride*0 + xStride*1]; | |
| 1696 c= block[stride*1 + xStride*0]; | |
| 1697 d= block[stride*1 + xStride*1]; | |
| 1698 | |
| 1699 e= a-b; | |
| 1700 a= a+b; | |
| 1701 b= c-d; | |
| 1702 c= c+d; | |
| 1703 | |
| 1704 block[stride*0 + xStride*0]= (a+c); | |
| 1705 block[stride*0 + xStride*1]= (e+b); | |
| 1706 block[stride*1 + xStride*0]= (a-c); | |
| 1707 block[stride*1 + xStride*1]= (e-b); | |
| 1708 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1709 #endif |
| 1168 | 1710 |
| 1711 /** | |
| 1712 * gets the chroma qp. | |
| 1713 */ | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
1714 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
|
1715 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
1716 return chroma_qp[clip(qscale + chroma_qp_index_offset, 0, 51)]; |
| 1168 | 1717 } |
| 1718 | |
| 1719 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1720 #if 0 |
| 1168 | 1721 static void h264_diff_dct_c(DCTELEM *block, uint8_t *src1, uint8_t *src2, int stride){ |
| 1722 int i; | |
| 1723 //FIXME try int temp instead of block | |
| 1724 | |
| 1725 for(i=0; i<4; i++){ | |
| 1726 const int d0= src1[0 + i*stride] - src2[0 + i*stride]; | |
| 1727 const int d1= src1[1 + i*stride] - src2[1 + i*stride]; | |
| 1728 const int d2= src1[2 + i*stride] - src2[2 + i*stride]; | |
| 1729 const int d3= src1[3 + i*stride] - src2[3 + i*stride]; | |
| 1730 const int z0= d0 + d3; | |
| 1731 const int z3= d0 - d3; | |
| 1732 const int z1= d1 + d2; | |
| 1733 const int z2= d1 - d2; | |
| 1734 | |
| 1735 block[0 + 4*i]= z0 + z1; | |
| 1736 block[1 + 4*i]= 2*z3 + z2; | |
| 1737 block[2 + 4*i]= z0 - z1; | |
| 1738 block[3 + 4*i]= z3 - 2*z2; | |
| 1739 } | |
| 1740 | |
| 1741 for(i=0; i<4; i++){ | |
| 1742 const int z0= block[0*4 + i] + block[3*4 + i]; | |
| 1743 const int z3= block[0*4 + i] - block[3*4 + i]; | |
| 1744 const int z1= block[1*4 + i] + block[2*4 + i]; | |
| 1745 const int z2= block[1*4 + i] - block[2*4 + i]; | |
| 1746 | |
| 1747 block[0*4 + i]= z0 + z1; | |
| 1748 block[1*4 + i]= 2*z3 + z2; | |
| 1749 block[2*4 + i]= z0 - z1; | |
| 1750 block[3*4 + i]= z3 - 2*z2; | |
| 1751 } | |
| 1752 } | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
1753 #endif |
| 1168 | 1754 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
1755 //FIXME need to check that this doesnt overflow signed 32 bit for low qp, i am not sure, it's very close |
| 1168 | 1756 //FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away) |
| 1757 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int seperate_dc){ | |
| 1758 int i; | |
| 1759 const int * const quant_table= quant_coeff[qscale]; | |
| 1760 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6; | |
| 1761 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1; | |
| 1762 const unsigned int threshold2= (threshold1<<1); | |
| 1763 int last_non_zero; | |
| 1764 | |
| 1765 if(seperate_dc){ | |
| 1766 if(qscale<=18){ | |
| 1767 //avoid overflows | |
| 1768 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6; | |
| 1769 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1; | |
| 1770 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
| 1771 | |
| 1772 int level= block[0]*quant_coeff[qscale+18][0]; | |
| 1773 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
| 1774 if(level>0){ | |
| 1775 level= (dc_bias + level)>>(QUANT_SHIFT-2); | |
| 1776 block[0]= level; | |
| 1777 }else{ | |
| 1778 level= (dc_bias - level)>>(QUANT_SHIFT-2); | |
| 1779 block[0]= -level; | |
| 1780 } | |
| 1781 // last_non_zero = i; | |
| 1782 }else{ | |
| 1783 block[0]=0; | |
| 1784 } | |
| 1785 }else{ | |
| 1786 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6; | |
| 1787 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1; | |
| 1788 const unsigned int dc_threshold2= (dc_threshold1<<1); | |
| 1789 | |
| 1790 int level= block[0]*quant_table[0]; | |
| 1791 if(((unsigned)(level+dc_threshold1))>dc_threshold2){ | |
| 1792 if(level>0){ | |
| 1793 level= (dc_bias + level)>>(QUANT_SHIFT+1); | |
| 1794 block[0]= level; | |
| 1795 }else{ | |
| 1796 level= (dc_bias - level)>>(QUANT_SHIFT+1); | |
| 1797 block[0]= -level; | |
| 1798 } | |
| 1799 // last_non_zero = i; | |
| 1800 }else{ | |
| 1801 block[0]=0; | |
| 1802 } | |
| 1803 } | |
| 1804 last_non_zero= 0; | |
| 1805 i=1; | |
| 1806 }else{ | |
| 1807 last_non_zero= -1; | |
| 1808 i=0; | |
| 1809 } | |
| 1810 | |
| 1811 for(; i<16; i++){ | |
| 1812 const int j= scantable[i]; | |
| 1813 int level= block[j]*quant_table[j]; | |
| 1814 | |
| 1815 // if( bias+level >= (1<<(QMAT_SHIFT - 3)) | |
| 1816 // || bias-level >= (1<<(QMAT_SHIFT - 3))){ | |
| 1817 if(((unsigned)(level+threshold1))>threshold2){ | |
| 1818 if(level>0){ | |
| 1819 level= (bias + level)>>QUANT_SHIFT; | |
| 1820 block[j]= level; | |
| 1821 }else{ | |
| 1822 level= (bias - level)>>QUANT_SHIFT; | |
| 1823 block[j]= -level; | |
| 1824 } | |
| 1825 last_non_zero = i; | |
| 1826 }else{ | |
| 1827 block[j]=0; | |
| 1828 } | |
| 1829 } | |
| 1830 | |
| 1831 return last_non_zero; | |
| 1832 } | |
| 1833 | |
| 1834 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1835 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 1836 ((uint32_t*)(src+0*stride))[0]= a; | |
| 1837 ((uint32_t*)(src+1*stride))[0]= a; | |
| 1838 ((uint32_t*)(src+2*stride))[0]= a; | |
| 1839 ((uint32_t*)(src+3*stride))[0]= a; | |
| 1840 } | |
| 1841 | |
| 1842 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1843 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101; | |
| 1844 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101; | |
| 1845 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101; | |
| 1846 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101; | |
| 1847 } | |
| 1848 | |
| 1849 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1850 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] | |
| 1851 + src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 4) >>3; | |
| 1852 | |
| 1853 ((uint32_t*)(src+0*stride))[0]= | |
| 1854 ((uint32_t*)(src+1*stride))[0]= | |
| 1855 ((uint32_t*)(src+2*stride))[0]= | |
| 1856 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1857 } | |
| 1858 | |
| 1859 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1860 const int dc= ( src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 2) >>2; | |
| 1861 | |
| 1862 ((uint32_t*)(src+0*stride))[0]= | |
| 1863 ((uint32_t*)(src+1*stride))[0]= | |
| 1864 ((uint32_t*)(src+2*stride))[0]= | |
| 1865 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1866 } | |
| 1867 | |
| 1868 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1869 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2; | |
| 1870 | |
| 1871 ((uint32_t*)(src+0*stride))[0]= | |
| 1872 ((uint32_t*)(src+1*stride))[0]= | |
| 1873 ((uint32_t*)(src+2*stride))[0]= | |
| 1874 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101; | |
| 1875 } | |
| 1876 | |
| 1877 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1878 ((uint32_t*)(src+0*stride))[0]= | |
| 1879 ((uint32_t*)(src+1*stride))[0]= | |
| 1880 ((uint32_t*)(src+2*stride))[0]= | |
| 1881 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U; | |
| 1882 } | |
| 1883 | |
| 1884 | |
| 1885 #define LOAD_TOP_RIGHT_EDGE\ | |
| 1886 const int t4= topright[0];\ | |
| 1887 const int t5= topright[1];\ | |
| 1888 const int t6= topright[2];\ | |
| 1889 const int t7= topright[3];\ | |
| 1890 | |
| 1891 #define LOAD_LEFT_EDGE\ | |
| 1892 const int l0= src[-1+0*stride];\ | |
| 1893 const int l1= src[-1+1*stride];\ | |
| 1894 const int l2= src[-1+2*stride];\ | |
| 1895 const int l3= src[-1+3*stride];\ | |
| 1896 | |
| 1897 #define LOAD_TOP_EDGE\ | |
| 1898 const int t0= src[ 0-1*stride];\ | |
| 1899 const int t1= src[ 1-1*stride];\ | |
| 1900 const int t2= src[ 2-1*stride];\ | |
| 1901 const int t3= src[ 3-1*stride];\ | |
| 1902 | |
| 1903 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1904 const int lt= src[-1-1*stride]; | |
| 1905 LOAD_TOP_EDGE | |
| 1906 LOAD_LEFT_EDGE | |
| 1907 | |
| 1908 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2; | |
| 1909 src[0+2*stride]= | |
| 1910 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2; | |
| 1911 src[0+1*stride]= | |
| 1912 src[1+2*stride]= | |
| 1913 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2; | |
| 1914 src[0+0*stride]= | |
| 1915 src[1+1*stride]= | |
| 1916 src[2+2*stride]= | |
| 1917 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1918 src[1+0*stride]= | |
| 1919 src[2+1*stride]= | |
| 1920 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1921 src[2+0*stride]= | |
| 1922 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1923 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1282 | 1924 } |
| 1168 | 1925 |
| 1926 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1927 LOAD_TOP_EDGE | |
| 1928 LOAD_TOP_RIGHT_EDGE | |
| 1929 // LOAD_LEFT_EDGE | |
| 1930 | |
| 1931 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2; | |
| 1932 src[1+0*stride]= | |
| 1933 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2; | |
| 1934 src[2+0*stride]= | |
| 1935 src[1+1*stride]= | |
| 1936 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2; | |
| 1937 src[3+0*stride]= | |
| 1938 src[2+1*stride]= | |
| 1939 src[1+2*stride]= | |
| 1940 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2; | |
| 1941 src[3+1*stride]= | |
| 1942 src[2+2*stride]= | |
| 1943 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2; | |
| 1944 src[3+2*stride]= | |
| 1945 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2; | |
| 1946 src[3+3*stride]=(t6 + 3*t7 + 2)>>2; | |
| 1282 | 1947 } |
| 1168 | 1948 |
| 1949 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1950 const int lt= src[-1-1*stride]; | |
| 1951 LOAD_TOP_EDGE | |
| 1952 LOAD_LEFT_EDGE | |
| 1953 const __attribute__((unused)) int unu= l3; | |
| 1954 | |
| 1955 src[0+0*stride]= | |
| 1956 src[1+2*stride]=(lt + t0 + 1)>>1; | |
| 1957 src[1+0*stride]= | |
| 1958 src[2+2*stride]=(t0 + t1 + 1)>>1; | |
| 1959 src[2+0*stride]= | |
| 1960 src[3+2*stride]=(t1 + t2 + 1)>>1; | |
| 1961 src[3+0*stride]=(t2 + t3 + 1)>>1; | |
| 1962 src[0+1*stride]= | |
| 1963 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 1964 src[1+1*stride]= | |
| 1965 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 1966 src[2+1*stride]= | |
| 1967 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1968 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1969 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
| 1970 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 1282 | 1971 } |
| 1168 | 1972 |
| 1973 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1974 LOAD_TOP_EDGE | |
| 1975 LOAD_TOP_RIGHT_EDGE | |
| 1976 const __attribute__((unused)) int unu= t7; | |
| 1977 | |
| 1978 src[0+0*stride]=(t0 + t1 + 1)>>1; | |
| 1979 src[1+0*stride]= | |
| 1980 src[0+2*stride]=(t1 + t2 + 1)>>1; | |
| 1981 src[2+0*stride]= | |
| 1982 src[1+2*stride]=(t2 + t3 + 1)>>1; | |
| 1983 src[3+0*stride]= | |
| 1984 src[2+2*stride]=(t3 + t4+ 1)>>1; | |
| 1985 src[3+2*stride]=(t4 + t5+ 1)>>1; | |
| 1986 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 1987 src[1+1*stride]= | |
| 1988 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2; | |
| 1989 src[2+1*stride]= | |
| 1990 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2; | |
| 1991 src[3+1*stride]= | |
| 1992 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; | |
| 1993 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; | |
| 1282 | 1994 } |
| 1168 | 1995 |
| 1996 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 1997 LOAD_LEFT_EDGE | |
| 1998 | |
| 1999 src[0+0*stride]=(l0 + l1 + 1)>>1; | |
| 2000 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 2001 src[2+0*stride]= | |
| 2002 src[0+1*stride]=(l1 + l2 + 1)>>1; | |
| 2003 src[3+0*stride]= | |
| 2004 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
| 2005 src[2+1*stride]= | |
| 2006 src[0+2*stride]=(l2 + l3 + 1)>>1; | |
| 2007 src[3+1*stride]= | |
| 2008 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2; | |
| 2009 src[3+2*stride]= | |
| 2010 src[1+3*stride]= | |
| 2011 src[0+3*stride]= | |
| 2012 src[2+2*stride]= | |
| 2013 src[2+3*stride]= | |
| 2014 src[3+3*stride]=l3; | |
| 1282 | 2015 } |
| 1168 | 2016 |
| 2017 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){ | |
| 2018 const int lt= src[-1-1*stride]; | |
| 2019 LOAD_TOP_EDGE | |
| 2020 LOAD_LEFT_EDGE | |
| 2021 const __attribute__((unused)) int unu= t3; | |
| 2022 | |
| 2023 src[0+0*stride]= | |
| 2024 src[2+1*stride]=(lt + l0 + 1)>>1; | |
| 2025 src[1+0*stride]= | |
| 2026 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2; | |
| 2027 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2; | |
| 2028 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2; | |
| 2029 src[0+1*stride]= | |
| 2030 src[2+2*stride]=(l0 + l1 + 1)>>1; | |
| 2031 src[1+1*stride]= | |
| 2032 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2; | |
| 2033 src[0+2*stride]= | |
| 2034 src[2+3*stride]=(l1 + l2+ 1)>>1; | |
| 2035 src[1+2*stride]= | |
| 2036 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; | |
| 2037 src[0+3*stride]=(l2 + l3 + 1)>>1; | |
| 2038 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; | |
| 1282 | 2039 } |
| 1168 | 2040 |
| 2041 static void pred16x16_vertical_c(uint8_t *src, int stride){ | |
| 2042 int i; | |
| 2043 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 2044 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
| 2045 const uint32_t c= ((uint32_t*)(src-stride))[2]; | |
| 2046 const uint32_t d= ((uint32_t*)(src-stride))[3]; | |
| 2047 | |
| 2048 for(i=0; i<16; i++){ | |
| 2049 ((uint32_t*)(src+i*stride))[0]= a; | |
| 2050 ((uint32_t*)(src+i*stride))[1]= b; | |
| 2051 ((uint32_t*)(src+i*stride))[2]= c; | |
| 2052 ((uint32_t*)(src+i*stride))[3]= d; | |
| 2053 } | |
| 2054 } | |
| 2055 | |
| 2056 static void pred16x16_horizontal_c(uint8_t *src, int stride){ | |
| 2057 int i; | |
| 2058 | |
| 2059 for(i=0; i<16; i++){ | |
| 2060 ((uint32_t*)(src+i*stride))[0]= | |
| 2061 ((uint32_t*)(src+i*stride))[1]= | |
| 2062 ((uint32_t*)(src+i*stride))[2]= | |
| 2063 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101; | |
| 2064 } | |
| 2065 } | |
| 2066 | |
| 2067 static void pred16x16_dc_c(uint8_t *src, int stride){ | |
| 2068 int i, dc=0; | |
| 2069 | |
| 2070 for(i=0;i<16; i++){ | |
| 2071 dc+= src[-1+i*stride]; | |
| 2072 } | |
| 2073 | |
| 2074 for(i=0;i<16; i++){ | |
| 2075 dc+= src[i-stride]; | |
| 2076 } | |
| 2077 | |
| 2078 dc= 0x01010101*((dc + 16)>>5); | |
| 2079 | |
| 2080 for(i=0; i<16; i++){ | |
| 2081 ((uint32_t*)(src+i*stride))[0]= | |
| 2082 ((uint32_t*)(src+i*stride))[1]= | |
| 2083 ((uint32_t*)(src+i*stride))[2]= | |
| 2084 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 2085 } | |
| 2086 } | |
| 2087 | |
| 2088 static void pred16x16_left_dc_c(uint8_t *src, int stride){ | |
| 2089 int i, dc=0; | |
| 2090 | |
| 2091 for(i=0;i<16; i++){ | |
| 2092 dc+= src[-1+i*stride]; | |
| 2093 } | |
| 2094 | |
| 2095 dc= 0x01010101*((dc + 8)>>4); | |
| 2096 | |
| 2097 for(i=0; i<16; i++){ | |
| 2098 ((uint32_t*)(src+i*stride))[0]= | |
| 2099 ((uint32_t*)(src+i*stride))[1]= | |
| 2100 ((uint32_t*)(src+i*stride))[2]= | |
| 2101 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 2102 } | |
| 2103 } | |
| 2104 | |
| 2105 static void pred16x16_top_dc_c(uint8_t *src, int stride){ | |
| 2106 int i, dc=0; | |
| 2107 | |
| 2108 for(i=0;i<16; i++){ | |
| 2109 dc+= src[i-stride]; | |
| 2110 } | |
| 2111 dc= 0x01010101*((dc + 8)>>4); | |
| 2112 | |
| 2113 for(i=0; i<16; i++){ | |
| 2114 ((uint32_t*)(src+i*stride))[0]= | |
| 2115 ((uint32_t*)(src+i*stride))[1]= | |
| 2116 ((uint32_t*)(src+i*stride))[2]= | |
| 2117 ((uint32_t*)(src+i*stride))[3]= dc; | |
| 2118 } | |
| 2119 } | |
| 2120 | |
| 2121 static void pred16x16_128_dc_c(uint8_t *src, int stride){ | |
| 2122 int i; | |
| 2123 | |
| 2124 for(i=0; i<16; i++){ | |
| 2125 ((uint32_t*)(src+i*stride))[0]= | |
| 2126 ((uint32_t*)(src+i*stride))[1]= | |
| 2127 ((uint32_t*)(src+i*stride))[2]= | |
| 2128 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U; | |
| 2129 } | |
| 2130 } | |
| 2131 | |
| 1234 | 2132 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
|
2133 int i, j, k; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2134 int a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2135 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
|
2136 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
|
2137 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
|
2138 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
|
2139 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
|
2140 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
|
2141 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
|
2142 src1 += stride; src2 -= stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2143 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
|
2144 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
|
2145 } |
| 1234 | 2146 if(svq3){ |
| 2147 H = ( 5*(H/4) ) / 16; | |
| 2148 V = ( 5*(V/4) ) / 16; | |
|
1330
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2149 |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2150 /* required for 100% accuracy */ |
|
c05c381a9c47
- fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents:
1322
diff
changeset
|
2151 i = H; H = V; V = i; |
| 1234 | 2152 }else{ |
| 2153 H = ( 5*H+32 ) >> 6; | |
| 2154 V = ( 5*V+32 ) >> 6; | |
| 2155 } | |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2156 |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2157 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
|
2158 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
|
2159 int b = a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2160 a += V; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2161 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
|
2162 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
|
2163 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
|
2164 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
|
2165 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
|
2166 b += 4*H; |
| 1168 | 2167 } |
|
1184
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2168 src += stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2169 } |
| 1168 | 2170 } |
| 2171 | |
| 1234 | 2172 static void pred16x16_plane_c(uint8_t *src, int stride){ |
| 2173 pred16x16_plane_compat_c(src, stride, 0); | |
| 2174 } | |
| 2175 | |
| 1168 | 2176 static void pred8x8_vertical_c(uint8_t *src, int stride){ |
| 2177 int i; | |
| 2178 const uint32_t a= ((uint32_t*)(src-stride))[0]; | |
| 2179 const uint32_t b= ((uint32_t*)(src-stride))[1]; | |
| 2180 | |
| 2181 for(i=0; i<8; i++){ | |
| 2182 ((uint32_t*)(src+i*stride))[0]= a; | |
| 2183 ((uint32_t*)(src+i*stride))[1]= b; | |
| 2184 } | |
| 2185 } | |
| 2186 | |
| 2187 static void pred8x8_horizontal_c(uint8_t *src, int stride){ | |
| 2188 int i; | |
| 2189 | |
| 2190 for(i=0; i<8; i++){ | |
| 2191 ((uint32_t*)(src+i*stride))[0]= | |
| 2192 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101; | |
| 2193 } | |
| 2194 } | |
| 2195 | |
| 2196 static void pred8x8_128_dc_c(uint8_t *src, int stride){ | |
| 2197 int i; | |
| 2198 | |
| 2755 | 2199 for(i=0; i<8; i++){ |
| 1168 | 2200 ((uint32_t*)(src+i*stride))[0]= |
| 2201 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U; | |
| 2202 } | |
| 2203 } | |
| 2204 | |
| 2205 static void pred8x8_left_dc_c(uint8_t *src, int stride){ | |
| 2206 int i; | |
| 2207 int dc0, dc2; | |
| 2208 | |
| 2209 dc0=dc2=0; | |
| 2210 for(i=0;i<4; i++){ | |
| 2211 dc0+= src[-1+i*stride]; | |
| 2212 dc2+= src[-1+(i+4)*stride]; | |
| 2213 } | |
| 2214 dc0= 0x01010101*((dc0 + 2)>>2); | |
| 2215 dc2= 0x01010101*((dc2 + 2)>>2); | |
| 2216 | |
| 2217 for(i=0; i<4; i++){ | |
| 2218 ((uint32_t*)(src+i*stride))[0]= | |
| 2219 ((uint32_t*)(src+i*stride))[1]= dc0; | |
| 2220 } | |
| 2221 for(i=4; i<8; i++){ | |
| 2222 ((uint32_t*)(src+i*stride))[0]= | |
| 2223 ((uint32_t*)(src+i*stride))[1]= dc2; | |
| 2224 } | |
| 2225 } | |
| 2226 | |
| 2227 static void pred8x8_top_dc_c(uint8_t *src, int stride){ | |
| 2228 int i; | |
| 2229 int dc0, dc1; | |
| 2230 | |
| 2231 dc0=dc1=0; | |
| 2232 for(i=0;i<4; i++){ | |
| 2233 dc0+= src[i-stride]; | |
| 2234 dc1+= src[4+i-stride]; | |
| 2235 } | |
| 2236 dc0= 0x01010101*((dc0 + 2)>>2); | |
| 2237 dc1= 0x01010101*((dc1 + 2)>>2); | |
| 2238 | |
| 2239 for(i=0; i<4; i++){ | |
| 2240 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2241 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2242 } | |
| 2243 for(i=4; i<8; i++){ | |
| 2244 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2245 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2246 } | |
| 2247 } | |
| 2248 | |
| 2249 | |
| 2250 static void pred8x8_dc_c(uint8_t *src, int stride){ | |
| 2251 int i; | |
| 2252 int dc0, dc1, dc2, dc3; | |
| 2253 | |
| 2254 dc0=dc1=dc2=0; | |
| 2255 for(i=0;i<4; i++){ | |
| 2256 dc0+= src[-1+i*stride] + src[i-stride]; | |
| 2257 dc1+= src[4+i-stride]; | |
| 2258 dc2+= src[-1+(i+4)*stride]; | |
| 2259 } | |
| 2260 dc3= 0x01010101*((dc1 + dc2 + 4)>>3); | |
| 2261 dc0= 0x01010101*((dc0 + 4)>>3); | |
| 2262 dc1= 0x01010101*((dc1 + 2)>>2); | |
| 2263 dc2= 0x01010101*((dc2 + 2)>>2); | |
| 2264 | |
| 2265 for(i=0; i<4; i++){ | |
| 2266 ((uint32_t*)(src+i*stride))[0]= dc0; | |
| 2267 ((uint32_t*)(src+i*stride))[1]= dc1; | |
| 2268 } | |
| 2269 for(i=4; i<8; i++){ | |
| 2270 ((uint32_t*)(src+i*stride))[0]= dc2; | |
| 2271 ((uint32_t*)(src+i*stride))[1]= dc3; | |
| 2272 } | |
| 2273 } | |
| 2274 | |
| 2275 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
|
2276 int j, k; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2277 int a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2278 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
|
2279 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
|
2280 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
|
2281 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
|
2282 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
|
2283 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
|
2284 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
|
2285 src1 += stride; src2 -= stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2286 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
|
2287 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
|
2288 } |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2289 H = ( 17*H+16 ) >> 5; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2290 V = ( 17*V+16 ) >> 5; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2291 |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2292 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
|
2293 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
|
2294 int b = a; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2295 a += V; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2296 src[0] = cm[ (b ) >> 5 ]; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2297 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
|
2298 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
|
2299 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
|
2300 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
|
2301 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
|
2302 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
|
2303 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
|
2304 src += stride; |
|
05a2ac8978ad
faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents:
1177
diff
changeset
|
2305 } |
| 1168 | 2306 } |
| 2307 | |
| 2755 | 2308 #define SRC(x,y) src[(x)+(y)*stride] |
| 2309 #define PL(y) \ | |
| 2310 const int l##y = (SRC(-1,y-1) + 2*SRC(-1,y) + SRC(-1,y+1) + 2) >> 2; | |
| 2311 #define PREDICT_8x8_LOAD_LEFT \ | |
| 2312 const int l0 = ((has_topleft ? SRC(-1,-1) : SRC(-1,0)) \ | |
| 2313 + 2*SRC(-1,0) + SRC(-1,1) + 2) >> 2; \ | |
| 2314 PL(1) PL(2) PL(3) PL(4) PL(5) PL(6) \ | |
| 2757 | 2315 const int l7 = (SRC(-1,6) + 3*SRC(-1,7) + 2) >> 2 |
| 2755 | 2316 |
| 2317 #define PT(x) \ | |
| 2318 const int t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2; | |
| 2319 #define PREDICT_8x8_LOAD_TOP \ | |
| 2320 const int t0 = ((has_topleft ? SRC(-1,-1) : SRC(0,-1)) \ | |
| 2321 + 2*SRC(0,-1) + SRC(1,-1) + 2) >> 2; \ | |
| 2322 PT(1) PT(2) PT(3) PT(4) PT(5) PT(6) \ | |
| 2323 const int t7 = ((has_topright ? SRC(8,-1) : SRC(7,-1)) \ | |
| 2757 | 2324 + 2*SRC(7,-1) + SRC(6,-1) + 2) >> 2 |
| 2755 | 2325 |
| 2326 #define PTR(x) \ | |
| 2327 t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2; | |
| 2328 #define PREDICT_8x8_LOAD_TOPRIGHT \ | |
| 2329 int t8, t9, t10, t11, t12, t13, t14, t15; \ | |
| 2330 if(has_topright) { \ | |
| 2331 PTR(8) PTR(9) PTR(10) PTR(11) PTR(12) PTR(13) PTR(14) \ | |
| 2332 t15 = (SRC(14,-1) + 3*SRC(15,-1) + 2) >> 2; \ | |
| 2333 } else t8=t9=t10=t11=t12=t13=t14=t15= SRC(7,-1); | |
| 2334 | |
| 2335 #define PREDICT_8x8_LOAD_TOPLEFT \ | |
| 2757 | 2336 const int lt = (SRC(-1,0) + 2*SRC(-1,-1) + SRC(0,-1) + 2) >> 2 |
| 2755 | 2337 |
| 2338 #define PREDICT_8x8_DC(v) \ | |
| 2339 int y; \ | |
| 2340 for( y = 0; y < 8; y++ ) { \ | |
| 2341 ((uint32_t*)src)[0] = \ | |
| 2342 ((uint32_t*)src)[1] = v; \ | |
| 2343 src += stride; \ | |
| 2344 } | |
| 2345 | |
| 2346 static void pred8x8l_128_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2347 { | |
| 2348 PREDICT_8x8_DC(0x80808080); | |
| 2349 } | |
| 2350 static void pred8x8l_left_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2351 { | |
| 2352 PREDICT_8x8_LOAD_LEFT; | |
| 2353 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7+4) >> 3) * 0x01010101; | |
| 2354 PREDICT_8x8_DC(dc); | |
| 2355 } | |
| 2356 static void pred8x8l_top_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2357 { | |
| 2358 PREDICT_8x8_LOAD_TOP; | |
| 2359 const uint32_t dc = ((t0+t1+t2+t3+t4+t5+t6+t7+4) >> 3) * 0x01010101; | |
| 2360 PREDICT_8x8_DC(dc); | |
| 2361 } | |
| 2362 static void pred8x8l_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2363 { | |
| 2364 PREDICT_8x8_LOAD_LEFT; | |
| 2365 PREDICT_8x8_LOAD_TOP; | |
| 2366 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7 | |
| 2367 +t0+t1+t2+t3+t4+t5+t6+t7+8) >> 4) * 0x01010101; | |
| 2368 PREDICT_8x8_DC(dc); | |
| 2369 } | |
| 2370 static void pred8x8l_horizontal_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2371 { | |
| 2372 PREDICT_8x8_LOAD_LEFT; | |
| 2373 #define ROW(y) ((uint32_t*)(src+y*stride))[0] =\ | |
| 2374 ((uint32_t*)(src+y*stride))[1] = 0x01010101 * l##y | |
| 2375 ROW(0); ROW(1); ROW(2); ROW(3); ROW(4); ROW(5); ROW(6); ROW(7); | |
| 2376 #undef ROW | |
| 2377 } | |
| 2378 static void pred8x8l_vertical_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2379 { | |
| 2380 int y; | |
| 2381 PREDICT_8x8_LOAD_TOP; | |
| 2382 src[0] = t0; | |
| 2383 src[1] = t1; | |
| 2384 src[2] = t2; | |
| 2385 src[3] = t3; | |
| 2386 src[4] = t4; | |
| 2387 src[5] = t5; | |
| 2388 src[6] = t6; | |
| 2389 src[7] = t7; | |
| 2390 for( y = 1; y < 8; y++ ) | |
| 2391 *(uint64_t*)(src+y*stride) = *(uint64_t*)src; | |
| 2392 } | |
| 2393 static void pred8x8l_down_left_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2394 { | |
| 2395 PREDICT_8x8_LOAD_TOP; | |
| 2396 PREDICT_8x8_LOAD_TOPRIGHT; | |
| 2397 SRC(0,0)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2398 SRC(0,1)=SRC(1,0)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2399 SRC(0,2)=SRC(1,1)=SRC(2,0)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2400 SRC(0,3)=SRC(1,2)=SRC(2,1)=SRC(3,0)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2401 SRC(0,4)=SRC(1,3)=SRC(2,2)=SRC(3,1)=SRC(4,0)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2402 SRC(0,5)=SRC(1,4)=SRC(2,3)=SRC(3,2)=SRC(4,1)=SRC(5,0)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2403 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; | |
| 2404 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; | |
| 2405 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; | |
| 2406 SRC(2,7)=SRC(3,6)=SRC(4,5)=SRC(5,4)=SRC(6,3)=SRC(7,2)= (t9 + 2*t10 + t11 + 2) >> 2; | |
| 2407 SRC(3,7)=SRC(4,6)=SRC(5,5)=SRC(6,4)=SRC(7,3)= (t10 + 2*t11 + t12 + 2) >> 2; | |
| 2408 SRC(4,7)=SRC(5,6)=SRC(6,5)=SRC(7,4)= (t11 + 2*t12 + t13 + 2) >> 2; | |
| 2409 SRC(5,7)=SRC(6,6)=SRC(7,5)= (t12 + 2*t13 + t14 + 2) >> 2; | |
| 2410 SRC(6,7)=SRC(7,6)= (t13 + 2*t14 + t15 + 2) >> 2; | |
| 2411 SRC(7,7)= (t14 + 3*t15 + 2) >> 2; | |
| 2412 } | |
| 2413 static void pred8x8l_down_right_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2414 { | |
| 2415 PREDICT_8x8_LOAD_TOP; | |
| 2416 PREDICT_8x8_LOAD_LEFT; | |
| 2417 PREDICT_8x8_LOAD_TOPLEFT; | |
| 2418 SRC(0,7)= (l7 + 2*l6 + l5 + 2) >> 2; | |
| 2419 SRC(0,6)=SRC(1,7)= (l6 + 2*l5 + l4 + 2) >> 2; | |
| 2420 SRC(0,5)=SRC(1,6)=SRC(2,7)= (l5 + 2*l4 + l3 + 2) >> 2; | |
| 2421 SRC(0,4)=SRC(1,5)=SRC(2,6)=SRC(3,7)= (l4 + 2*l3 + l2 + 2) >> 2; | |
| 2422 SRC(0,3)=SRC(1,4)=SRC(2,5)=SRC(3,6)=SRC(4,7)= (l3 + 2*l2 + l1 + 2) >> 2; | |
| 2423 SRC(0,2)=SRC(1,3)=SRC(2,4)=SRC(3,5)=SRC(4,6)=SRC(5,7)= (l2 + 2*l1 + l0 + 2) >> 2; | |
| 2424 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; | |
| 2425 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; | |
| 2426 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; | |
| 2427 SRC(2,0)=SRC(3,1)=SRC(4,2)=SRC(5,3)=SRC(6,4)=SRC(7,5)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2428 SRC(3,0)=SRC(4,1)=SRC(5,2)=SRC(6,3)=SRC(7,4)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2429 SRC(4,0)=SRC(5,1)=SRC(6,2)=SRC(7,3)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2430 SRC(5,0)=SRC(6,1)=SRC(7,2)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2431 SRC(6,0)=SRC(7,1)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2432 SRC(7,0)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2433 | |
| 2434 } | |
| 2435 static void pred8x8l_vertical_right_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2436 { | |
| 2437 PREDICT_8x8_LOAD_TOP; | |
| 2438 PREDICT_8x8_LOAD_LEFT; | |
| 2439 PREDICT_8x8_LOAD_TOPLEFT; | |
| 2440 SRC(0,6)= (l5 + 2*l4 + l3 + 2) >> 2; | |
| 2441 SRC(0,7)= (l6 + 2*l5 + l4 + 2) >> 2; | |
| 2442 SRC(0,4)=SRC(1,6)= (l3 + 2*l2 + l1 + 2) >> 2; | |
| 2443 SRC(0,5)=SRC(1,7)= (l4 + 2*l3 + l2 + 2) >> 2; | |
| 2444 SRC(0,2)=SRC(1,4)=SRC(2,6)= (l1 + 2*l0 + lt + 2) >> 2; | |
| 2445 SRC(0,3)=SRC(1,5)=SRC(2,7)= (l2 + 2*l1 + l0 + 2) >> 2; | |
| 2446 SRC(0,1)=SRC(1,3)=SRC(2,5)=SRC(3,7)= (l0 + 2*lt + t0 + 2) >> 2; | |
| 2447 SRC(0,0)=SRC(1,2)=SRC(2,4)=SRC(3,6)= (lt + t0 + 1) >> 1; | |
| 2448 SRC(1,1)=SRC(2,3)=SRC(3,5)=SRC(4,7)= (lt + 2*t0 + t1 + 2) >> 2; | |
| 2449 SRC(1,0)=SRC(2,2)=SRC(3,4)=SRC(4,6)= (t0 + t1 + 1) >> 1; | |
| 2450 SRC(2,1)=SRC(3,3)=SRC(4,5)=SRC(5,7)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2451 SRC(2,0)=SRC(3,2)=SRC(4,4)=SRC(5,6)= (t1 + t2 + 1) >> 1; | |
| 2452 SRC(3,1)=SRC(4,3)=SRC(5,5)=SRC(6,7)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2453 SRC(3,0)=SRC(4,2)=SRC(5,4)=SRC(6,6)= (t2 + t3 + 1) >> 1; | |
| 2454 SRC(4,1)=SRC(5,3)=SRC(6,5)=SRC(7,7)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2455 SRC(4,0)=SRC(5,2)=SRC(6,4)=SRC(7,6)= (t3 + t4 + 1) >> 1; | |
| 2456 SRC(5,1)=SRC(6,3)=SRC(7,5)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2457 SRC(5,0)=SRC(6,2)=SRC(7,4)= (t4 + t5 + 1) >> 1; | |
| 2458 SRC(6,1)=SRC(7,3)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2459 SRC(6,0)=SRC(7,2)= (t5 + t6 + 1) >> 1; | |
| 2460 SRC(7,1)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2461 SRC(7,0)= (t6 + t7 + 1) >> 1; | |
| 2462 } | |
| 2463 static void pred8x8l_horizontal_down_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2464 { | |
| 2465 PREDICT_8x8_LOAD_TOP; | |
| 2466 PREDICT_8x8_LOAD_LEFT; | |
| 2467 PREDICT_8x8_LOAD_TOPLEFT; | |
| 2468 SRC(0,7)= (l6 + l7 + 1) >> 1; | |
| 2469 SRC(1,7)= (l5 + 2*l6 + l7 + 2) >> 2; | |
| 2470 SRC(0,6)=SRC(2,7)= (l5 + l6 + 1) >> 1; | |
| 2471 SRC(1,6)=SRC(3,7)= (l4 + 2*l5 + l6 + 2) >> 2; | |
| 2472 SRC(0,5)=SRC(2,6)=SRC(4,7)= (l4 + l5 + 1) >> 1; | |
| 2473 SRC(1,5)=SRC(3,6)=SRC(5,7)= (l3 + 2*l4 + l5 + 2) >> 2; | |
| 2474 SRC(0,4)=SRC(2,5)=SRC(4,6)=SRC(6,7)= (l3 + l4 + 1) >> 1; | |
| 2475 SRC(1,4)=SRC(3,5)=SRC(5,6)=SRC(7,7)= (l2 + 2*l3 + l4 + 2) >> 2; | |
| 2476 SRC(0,3)=SRC(2,4)=SRC(4,5)=SRC(6,6)= (l2 + l3 + 1) >> 1; | |
| 2477 SRC(1,3)=SRC(3,4)=SRC(5,5)=SRC(7,6)= (l1 + 2*l2 + l3 + 2) >> 2; | |
| 2478 SRC(0,2)=SRC(2,3)=SRC(4,4)=SRC(6,5)= (l1 + l2 + 1) >> 1; | |
| 2479 SRC(1,2)=SRC(3,3)=SRC(5,4)=SRC(7,5)= (l0 + 2*l1 + l2 + 2) >> 2; | |
| 2480 SRC(0,1)=SRC(2,2)=SRC(4,3)=SRC(6,4)= (l0 + l1 + 1) >> 1; | |
| 2481 SRC(1,1)=SRC(3,2)=SRC(5,3)=SRC(7,4)= (lt + 2*l0 + l1 + 2) >> 2; | |
| 2482 SRC(0,0)=SRC(2,1)=SRC(4,2)=SRC(6,3)= (lt + l0 + 1) >> 1; | |
| 2483 SRC(1,0)=SRC(3,1)=SRC(5,2)=SRC(7,3)= (l0 + 2*lt + t0 + 2) >> 2; | |
| 2484 SRC(2,0)=SRC(4,1)=SRC(6,2)= (t1 + 2*t0 + lt + 2) >> 2; | |
| 2485 SRC(3,0)=SRC(5,1)=SRC(7,2)= (t2 + 2*t1 + t0 + 2) >> 2; | |
| 2486 SRC(4,0)=SRC(6,1)= (t3 + 2*t2 + t1 + 2) >> 2; | |
| 2487 SRC(5,0)=SRC(7,1)= (t4 + 2*t3 + t2 + 2) >> 2; | |
| 2488 SRC(6,0)= (t5 + 2*t4 + t3 + 2) >> 2; | |
| 2489 SRC(7,0)= (t6 + 2*t5 + t4 + 2) >> 2; | |
| 2490 } | |
| 2491 static void pred8x8l_vertical_left_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2492 { | |
| 2493 PREDICT_8x8_LOAD_TOP; | |
| 2494 PREDICT_8x8_LOAD_TOPRIGHT; | |
| 2495 SRC(0,0)= (t0 + t1 + 1) >> 1; | |
| 2496 SRC(0,1)= (t0 + 2*t1 + t2 + 2) >> 2; | |
| 2497 SRC(0,2)=SRC(1,0)= (t1 + t2 + 1) >> 1; | |
| 2498 SRC(0,3)=SRC(1,1)= (t1 + 2*t2 + t3 + 2) >> 2; | |
| 2499 SRC(0,4)=SRC(1,2)=SRC(2,0)= (t2 + t3 + 1) >> 1; | |
| 2500 SRC(0,5)=SRC(1,3)=SRC(2,1)= (t2 + 2*t3 + t4 + 2) >> 2; | |
| 2501 SRC(0,6)=SRC(1,4)=SRC(2,2)=SRC(3,0)= (t3 + t4 + 1) >> 1; | |
| 2502 SRC(0,7)=SRC(1,5)=SRC(2,3)=SRC(3,1)= (t3 + 2*t4 + t5 + 2) >> 2; | |
| 2503 SRC(1,6)=SRC(2,4)=SRC(3,2)=SRC(4,0)= (t4 + t5 + 1) >> 1; | |
| 2504 SRC(1,7)=SRC(2,5)=SRC(3,3)=SRC(4,1)= (t4 + 2*t5 + t6 + 2) >> 2; | |
| 2505 SRC(2,6)=SRC(3,4)=SRC(4,2)=SRC(5,0)= (t5 + t6 + 1) >> 1; | |
| 2506 SRC(2,7)=SRC(3,5)=SRC(4,3)=SRC(5,1)= (t5 + 2*t6 + t7 + 2) >> 2; | |
| 2507 SRC(3,6)=SRC(4,4)=SRC(5,2)=SRC(6,0)= (t6 + t7 + 1) >> 1; | |
| 2508 SRC(3,7)=SRC(4,5)=SRC(5,3)=SRC(6,1)= (t6 + 2*t7 + t8 + 2) >> 2; | |
| 2509 SRC(4,6)=SRC(5,4)=SRC(6,2)=SRC(7,0)= (t7 + t8 + 1) >> 1; | |
| 2510 SRC(4,7)=SRC(5,5)=SRC(6,3)=SRC(7,1)= (t7 + 2*t8 + t9 + 2) >> 2; | |
| 2511 SRC(5,6)=SRC(6,4)=SRC(7,2)= (t8 + t9 + 1) >> 1; | |
| 2512 SRC(5,7)=SRC(6,5)=SRC(7,3)= (t8 + 2*t9 + t10 + 2) >> 2; | |
| 2513 SRC(6,6)=SRC(7,4)= (t9 + t10 + 1) >> 1; | |
| 2514 SRC(6,7)=SRC(7,5)= (t9 + 2*t10 + t11 + 2) >> 2; | |
| 2515 SRC(7,6)= (t10 + t11 + 1) >> 1; | |
| 2516 SRC(7,7)= (t10 + 2*t11 + t12 + 2) >> 2; | |
| 2517 } | |
| 2518 static void pred8x8l_horizontal_up_c(uint8_t *src, int has_topleft, int has_topright, int stride) | |
| 2519 { | |
| 2520 PREDICT_8x8_LOAD_LEFT; | |
| 2521 SRC(0,0)= (l0 + l1 + 1) >> 1; | |
| 2522 SRC(1,0)= (l0 + 2*l1 + l2 + 2) >> 2; | |
| 2523 SRC(0,1)=SRC(2,0)= (l1 + l2 + 1) >> 1; | |
| 2524 SRC(1,1)=SRC(3,0)= (l1 + 2*l2 + l3 + 2) >> 2; | |
| 2525 SRC(0,2)=SRC(2,1)=SRC(4,0)= (l2 + l3 + 1) >> 1; | |
| 2526 SRC(1,2)=SRC(3,1)=SRC(5,0)= (l2 + 2*l3 + l4 + 2) >> 2; | |
| 2527 SRC(0,3)=SRC(2,2)=SRC(4,1)=SRC(6,0)= (l3 + l4 + 1) >> 1; | |
| 2528 SRC(1,3)=SRC(3,2)=SRC(5,1)=SRC(7,0)= (l3 + 2*l4 + l5 + 2) >> 2; | |
| 2529 SRC(0,4)=SRC(2,3)=SRC(4,2)=SRC(6,1)= (l4 + l5 + 1) >> 1; | |
| 2530 SRC(1,4)=SRC(3,3)=SRC(5,2)=SRC(7,1)= (l4 + 2*l5 + l6 + 2) >> 2; | |
| 2531 SRC(0,5)=SRC(2,4)=SRC(4,3)=SRC(6,2)= (l5 + l6 + 1) >> 1; | |
| 2532 SRC(1,5)=SRC(3,4)=SRC(5,3)=SRC(7,2)= (l5 + 2*l6 + l7 + 2) >> 2; | |
| 2533 SRC(0,6)=SRC(2,5)=SRC(4,4)=SRC(6,3)= (l6 + l7 + 1) >> 1; | |
| 2534 SRC(1,6)=SRC(3,5)=SRC(5,4)=SRC(7,3)= (l6 + 3*l7 + 2) >> 2; | |
| 2535 SRC(0,7)=SRC(1,7)=SRC(2,6)=SRC(2,7)=SRC(3,6)= | |
| 2536 SRC(3,7)=SRC(4,5)=SRC(4,6)=SRC(4,7)=SRC(5,5)= | |
| 2537 SRC(5,6)=SRC(5,7)=SRC(6,4)=SRC(6,5)=SRC(6,6)= | |
| 2538 SRC(6,7)=SRC(7,4)=SRC(7,5)=SRC(7,6)=SRC(7,7)= l7; | |
| 2539 } | |
| 2540 #undef PREDICT_8x8_LOAD_LEFT | |
| 2541 #undef PREDICT_8x8_LOAD_TOP | |
| 2542 #undef PREDICT_8x8_LOAD_TOPLEFT | |
| 2543 #undef PREDICT_8x8_LOAD_TOPRIGHT | |
| 2544 #undef PREDICT_8x8_DC | |
| 2545 #undef PTR | |
| 2546 #undef PT | |
| 2547 #undef PL | |
| 2548 #undef SRC | |
| 2549 | |
| 1168 | 2550 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list, |
| 2551 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2552 int src_x_offset, int src_y_offset, | |
| 2553 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){ | |
| 2554 MpegEncContext * const s = &h->s; | |
| 2555 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8; | |
| 2556 const int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8; | |
| 2557 const int luma_xy= (mx&3) + ((my&3)<<2); | |
| 2558 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*s->linesize; | |
| 2559 uint8_t * src_cb= pic->data[1] + (mx>>3) + (my>>3)*s->uvlinesize; | |
| 2560 uint8_t * src_cr= pic->data[2] + (mx>>3) + (my>>3)*s->uvlinesize; | |
| 2561 int extra_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; //FIXME increase edge?, IMHO not worth it | |
| 2562 int extra_height= extra_width; | |
| 2563 int emu=0; | |
| 2564 const int full_mx= mx>>2; | |
| 2565 const int full_my= my>>2; | |
| 2566 | |
| 2567 assert(pic->data[0]); | |
| 2568 | |
| 2569 if(mx&7) extra_width -= 3; | |
| 2570 if(my&7) extra_height -= 3; | |
| 2571 | |
| 2572 if( full_mx < 0-extra_width | |
| 2573 || full_my < 0-extra_height | |
| 2574 || full_mx + 16/*FIXME*/ > s->width + extra_width | |
| 2575 || full_my + 16/*FIXME*/ > s->height + extra_height){ | |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
2576 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 | 2577 src_y= s->edge_emu_buffer + 2 + 2*s->linesize; |
| 2578 emu=1; | |
| 2579 } | |
| 2580 | |
| 2581 qpix_op[luma_xy](dest_y, src_y, s->linesize); //FIXME try variable height perhaps? | |
| 2582 if(!square){ | |
| 2583 qpix_op[luma_xy](dest_y + delta, src_y + delta, s->linesize); | |
| 2584 } | |
| 2585 | |
| 2586 if(s->flags&CODEC_FLAG_GRAY) return; | |
| 2587 | |
| 2588 if(emu){ | |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
2589 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 | 2590 src_cb= s->edge_emu_buffer; |
| 2591 } | |
| 2592 chroma_op(dest_cb, src_cb, s->uvlinesize, chroma_height, mx&7, my&7); | |
| 2593 | |
| 2594 if(emu){ | |
|
1317
26c44d2433c1
make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents:
1282
diff
changeset
|
2595 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 | 2596 src_cr= s->edge_emu_buffer; |
| 2597 } | |
| 2598 chroma_op(dest_cr, src_cr, s->uvlinesize, chroma_height, mx&7, my&7); | |
| 2599 } | |
| 2600 | |
| 2415 | 2601 static inline void mc_part_std(H264Context *h, int n, int square, int chroma_height, int delta, |
| 1168 | 2602 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
| 2603 int x_offset, int y_offset, | |
| 2604 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2605 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
| 2606 int list0, int list1){ | |
| 2607 MpegEncContext * const s = &h->s; | |
| 2608 qpel_mc_func *qpix_op= qpix_put; | |
| 2609 h264_chroma_mc_func chroma_op= chroma_put; | |
| 2610 | |
| 2611 dest_y += 2*x_offset + 2*y_offset*s-> linesize; | |
| 2612 dest_cb += x_offset + y_offset*s->uvlinesize; | |
| 2613 dest_cr += x_offset + y_offset*s->uvlinesize; | |
| 2614 x_offset += 8*s->mb_x; | |
| 2615 y_offset += 8*s->mb_y; | |
| 2616 | |
| 2617 if(list0){ | |
| 1169 | 2618 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ]; |
| 1168 | 2619 mc_dir_part(h, ref, n, square, chroma_height, delta, 0, |
| 2620 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2621 qpix_op, chroma_op); | |
| 2622 | |
| 2623 qpix_op= qpix_avg; | |
| 2624 chroma_op= chroma_avg; | |
| 2625 } | |
| 2626 | |
| 2627 if(list1){ | |
| 1169 | 2628 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ]; |
| 1168 | 2629 mc_dir_part(h, ref, n, square, chroma_height, delta, 1, |
| 2630 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2631 qpix_op, chroma_op); | |
| 2632 } | |
| 2633 } | |
| 2634 | |
| 2415 | 2635 static inline void mc_part_weighted(H264Context *h, int n, int square, int chroma_height, int delta, |
| 2636 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2637 int x_offset, int y_offset, | |
| 2638 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2639 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op, | |
| 2640 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg, | |
| 2641 int list0, int list1){ | |
| 2642 MpegEncContext * const s = &h->s; | |
| 2643 | |
| 2644 dest_y += 2*x_offset + 2*y_offset*s-> linesize; | |
| 2645 dest_cb += x_offset + y_offset*s->uvlinesize; | |
| 2646 dest_cr += x_offset + y_offset*s->uvlinesize; | |
| 2647 x_offset += 8*s->mb_x; | |
| 2648 y_offset += 8*s->mb_y; | |
| 2649 | |
| 2650 if(list0 && list1){ | |
| 2651 /* don't optimize for luma-only case, since B-frames usually | |
| 2652 * use implicit weights => chroma too. */ | |
| 2653 uint8_t *tmp_cb = s->obmc_scratchpad; | |
| 2654 uint8_t *tmp_cr = tmp_cb + 8*s->uvlinesize; | |
| 2655 uint8_t *tmp_y = tmp_cr + 8*s->uvlinesize; | |
| 2656 int refn0 = h->ref_cache[0][ scan8[n] ]; | |
| 2657 int refn1 = h->ref_cache[1][ scan8[n] ]; | |
| 2658 | |
| 2659 mc_dir_part(h, &h->ref_list[0][refn0], n, square, chroma_height, delta, 0, | |
| 2660 dest_y, dest_cb, dest_cr, | |
| 2661 x_offset, y_offset, qpix_put, chroma_put); | |
| 2662 mc_dir_part(h, &h->ref_list[1][refn1], n, square, chroma_height, delta, 1, | |
| 2663 tmp_y, tmp_cb, tmp_cr, | |
| 2664 x_offset, y_offset, qpix_put, chroma_put); | |
| 2665 | |
| 2666 if(h->use_weight == 2){ | |
| 2667 int weight0 = h->implicit_weight[refn0][refn1]; | |
| 2668 int weight1 = 64 - weight0; | |
| 2669 luma_weight_avg( dest_y, tmp_y, s-> linesize, 5, weight0, weight1, 0, 0); | |
| 2670 chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, 5, weight0, weight1, 0, 0); | |
| 2671 chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, 5, weight0, weight1, 0, 0); | |
| 2672 }else{ | |
| 2673 luma_weight_avg(dest_y, tmp_y, s->linesize, h->luma_log2_weight_denom, | |
| 2674 h->luma_weight[0][refn0], h->luma_weight[1][refn1], | |
| 2675 h->luma_offset[0][refn0], h->luma_offset[1][refn1]); | |
| 2676 chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, h->chroma_log2_weight_denom, | |
| 2677 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0], | |
| 2678 h->chroma_offset[0][refn0][0], h->chroma_offset[1][refn1][0]); | |
| 2679 chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, h->chroma_log2_weight_denom, | |
| 2680 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1], | |
| 2681 h->chroma_offset[0][refn0][1], h->chroma_offset[1][refn1][1]); | |
| 2682 } | |
| 2683 }else{ | |
| 2684 int list = list1 ? 1 : 0; | |
| 2685 int refn = h->ref_cache[list][ scan8[n] ]; | |
| 2686 Picture *ref= &h->ref_list[list][refn]; | |
| 2687 mc_dir_part(h, ref, n, square, chroma_height, delta, list, | |
| 2688 dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2689 qpix_put, chroma_put); | |
| 2690 | |
| 2691 luma_weight_op(dest_y, s->linesize, h->luma_log2_weight_denom, | |
| 2692 h->luma_weight[list][refn], h->luma_offset[list][refn]); | |
| 2693 if(h->use_weight_chroma){ | |
| 2694 chroma_weight_op(dest_cb, s->uvlinesize, h->chroma_log2_weight_denom, | |
| 2695 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]); | |
| 2696 chroma_weight_op(dest_cr, s->uvlinesize, h->chroma_log2_weight_denom, | |
| 2697 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]); | |
| 2698 } | |
| 2699 } | |
| 2700 } | |
| 2701 | |
| 2702 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta, | |
| 2703 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, | |
| 2704 int x_offset, int y_offset, | |
| 2705 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put, | |
| 2706 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg, | |
| 2707 h264_weight_func *weight_op, h264_biweight_func *weight_avg, | |
| 2708 int list0, int list1){ | |
| 2709 if((h->use_weight==2 && list0 && list1 | |
| 2710 && (h->implicit_weight[ h->ref_cache[0][scan8[n]] ][ h->ref_cache[1][scan8[n]] ] != 32)) | |
| 2711 || h->use_weight==1) | |
| 2712 mc_part_weighted(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
| 2713 x_offset, y_offset, qpix_put, chroma_put, | |
| 2714 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1); | |
| 2715 else | |
| 2716 mc_part_std(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr, | |
| 2717 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1); | |
| 2718 } | |
| 2719 | |
| 1168 | 2720 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, |
| 2721 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put), | |
| 2415 | 2722 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg), |
| 2723 h264_weight_func *weight_op, h264_biweight_func *weight_avg){ | |
| 1168 | 2724 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
|
2725 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 2726 const int mb_type= s->current_picture.mb_type[mb_xy]; |
| 2727 | |
| 2728 assert(IS_INTER(mb_type)); | |
| 2729 | |
| 2730 if(IS_16X16(mb_type)){ | |
| 2731 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2732 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0], | |
| 2415 | 2733 &weight_op[0], &weight_avg[0], |
| 1168 | 2734 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 2735 }else if(IS_16X8(mb_type)){ | |
| 2736 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2737 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0], | |
| 2415 | 2738 &weight_op[1], &weight_avg[1], |
| 1168 | 2739 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 2740 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4, | |
| 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, 1, 0), IS_DIR(mb_type, 1, 1)); |
| 2744 }else if(IS_8X16(mb_type)){ | |
| 2745 mc_part(h, 0, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 0, 0, | |
| 2746 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
| 2415 | 2747 &weight_op[2], &weight_avg[2], |
| 1168 | 2748 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1)); |
| 2749 mc_part(h, 4, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 4, 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, 1, 0), IS_DIR(mb_type, 1, 1)); |
| 2753 }else{ | |
| 2754 int i; | |
| 2755 | |
| 2756 assert(IS_8X8(mb_type)); | |
| 2757 | |
| 2758 for(i=0; i<4; i++){ | |
| 2759 const int sub_mb_type= h->sub_mb_type[i]; | |
| 2760 const int n= 4*i; | |
| 2761 int x_offset= (i&1)<<2; | |
| 2762 int y_offset= (i&2)<<1; | |
| 2763 | |
| 2764 if(IS_SUB_8X8(sub_mb_type)){ | |
| 2765 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2766 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1], | |
| 2415 | 2767 &weight_op[3], &weight_avg[3], |
| 1168 | 2768 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2769 }else if(IS_SUB_8X4(sub_mb_type)){ | |
| 2770 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2771 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1], | |
| 2415 | 2772 &weight_op[4], &weight_avg[4], |
| 1168 | 2773 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2774 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2, | |
| 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 }else if(IS_SUB_4X8(sub_mb_type)){ | |
| 2779 mc_part(h, n , 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset, | |
| 2780 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
| 2415 | 2781 &weight_op[5], &weight_avg[5], |
| 1168 | 2782 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2783 mc_part(h, n+1, 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset+2, 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 }else{ | |
| 2788 int j; | |
| 2789 assert(IS_SUB_4X4(sub_mb_type)); | |
| 2790 for(j=0; j<4; j++){ | |
| 2791 int sub_x_offset= x_offset + 2*(j&1); | |
| 2792 int sub_y_offset= y_offset + (j&2); | |
| 2793 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset, | |
| 2794 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2], | |
| 2415 | 2795 &weight_op[6], &weight_avg[6], |
| 1168 | 2796 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); |
| 2797 } | |
| 2798 } | |
| 2799 } | |
| 2800 } | |
| 2801 } | |
| 2802 | |
| 2803 static void decode_init_vlc(H264Context *h){ | |
| 2804 static int done = 0; | |
| 2805 | |
| 2806 if (!done) { | |
| 2807 int i; | |
| 2808 done = 1; | |
| 2809 | |
| 2810 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5, | |
| 2811 &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
|
2812 &chroma_dc_coeff_token_bits[0], 1, 1, 1); |
| 1168 | 2813 |
| 2814 for(i=0; i<4; i++){ | |
| 2815 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17, | |
| 2816 &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
|
2817 &coeff_token_bits[i][0], 1, 1, 1); |
| 1168 | 2818 } |
| 2819 | |
| 2820 for(i=0; i<3; i++){ | |
| 2821 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4, | |
| 2822 &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
|
2823 &chroma_dc_total_zeros_bits[i][0], 1, 1, 1); |
| 1168 | 2824 } |
| 2825 for(i=0; i<15; i++){ | |
| 2826 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16, | |
| 2827 &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
|
2828 &total_zeros_bits[i][0], 1, 1, 1); |
| 1168 | 2829 } |
| 2830 | |
| 2831 for(i=0; i<6; i++){ | |
| 2832 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7, | |
| 2833 &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
|
2834 &run_bits[i][0], 1, 1, 1); |
| 1168 | 2835 } |
| 2836 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16, | |
| 2837 &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
|
2838 &run_bits[6][0], 1, 1, 1); |
| 1168 | 2839 } |
| 2840 } | |
| 2841 | |
| 2842 /** | |
| 2843 * Sets the intra prediction function pointers. | |
| 2844 */ | |
| 2845 static void init_pred_ptrs(H264Context *h){ | |
| 2846 // MpegEncContext * const s = &h->s; | |
| 2847 | |
| 2848 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; | |
| 2849 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; | |
| 2850 h->pred4x4[DC_PRED ]= pred4x4_dc_c; | |
| 2851 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c; | |
| 2852 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c; | |
| 2853 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c; | |
| 2854 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c; | |
| 2855 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c; | |
| 2856 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c; | |
| 2857 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c; | |
| 2858 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c; | |
| 2859 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; | |
| 2860 | |
| 2755 | 2861 h->pred8x8l[VERT_PRED ]= pred8x8l_vertical_c; |
| 2862 h->pred8x8l[HOR_PRED ]= pred8x8l_horizontal_c; | |
| 2863 h->pred8x8l[DC_PRED ]= pred8x8l_dc_c; | |
| 2864 h->pred8x8l[DIAG_DOWN_LEFT_PRED ]= pred8x8l_down_left_c; | |
| 2865 h->pred8x8l[DIAG_DOWN_RIGHT_PRED]= pred8x8l_down_right_c; | |
| 2866 h->pred8x8l[VERT_RIGHT_PRED ]= pred8x8l_vertical_right_c; | |
| 2867 h->pred8x8l[HOR_DOWN_PRED ]= pred8x8l_horizontal_down_c; | |
| 2868 h->pred8x8l[VERT_LEFT_PRED ]= pred8x8l_vertical_left_c; | |
| 2869 h->pred8x8l[HOR_UP_PRED ]= pred8x8l_horizontal_up_c; | |
| 2870 h->pred8x8l[LEFT_DC_PRED ]= pred8x8l_left_dc_c; | |
| 2871 h->pred8x8l[TOP_DC_PRED ]= pred8x8l_top_dc_c; | |
| 2872 h->pred8x8l[DC_128_PRED ]= pred8x8l_128_dc_c; | |
| 2873 | |
| 1168 | 2874 h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c; |
| 2875 h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c; | |
| 2876 h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c; | |
| 2877 h->pred8x8[PLANE_PRED8x8 ]= pred8x8_plane_c; | |
| 2878 h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c; | |
| 2879 h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c; | |
| 2880 h->pred8x8[DC_128_PRED8x8 ]= pred8x8_128_dc_c; | |
| 2881 | |
| 2882 h->pred16x16[DC_PRED8x8 ]= pred16x16_dc_c; | |
| 2883 h->pred16x16[VERT_PRED8x8 ]= pred16x16_vertical_c; | |
| 2884 h->pred16x16[HOR_PRED8x8 ]= pred16x16_horizontal_c; | |
| 2885 h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c; | |
| 2886 h->pred16x16[LEFT_DC_PRED8x8]= pred16x16_left_dc_c; | |
| 2887 h->pred16x16[TOP_DC_PRED8x8 ]= pred16x16_top_dc_c; | |
| 2888 h->pred16x16[DC_128_PRED8x8 ]= pred16x16_128_dc_c; | |
| 2889 } | |
| 2890 | |
| 2891 static void free_tables(H264Context *h){ | |
| 2892 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
|
2893 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
|
2894 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
|
2895 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
|
2896 av_freep(&h->mvd_table[1]); |
| 2396 | 2897 av_freep(&h->direct_table); |
| 1168 | 2898 av_freep(&h->non_zero_count); |
| 2899 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
|
2900 av_freep(&h->top_borders[1]); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
2901 av_freep(&h->top_borders[0]); |
| 1168 | 2902 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
|
2903 |
| 1168 | 2904 av_freep(&h->mb2b_xy); |
| 2905 av_freep(&h->mb2b8_xy); | |
| 2415 | 2906 |
| 2755 | 2907 av_freep(&h->dequant8_coeff); |
| 2908 | |
| 2415 | 2909 av_freep(&h->s.obmc_scratchpad); |
| 1168 | 2910 } |
| 2911 | |
| 2912 /** | |
| 2913 * allocates tables. | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
2914 * needs width/height |
| 1168 | 2915 */ |
| 2916 static int alloc_tables(H264Context *h){ | |
| 2917 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
|
2918 const int big_mb_num= s->mb_stride * (s->mb_height+1); |
| 2755 | 2919 int x,y,q; |
| 1168 | 2920 |
| 2921 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
|
2922 |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
2923 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t)) |
| 1168 | 2924 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
|
2925 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
|
2926 CHECKED_ALLOCZ(h->top_borders[1] , s->mb_width * (16+8+8) * sizeof(uint8_t)) |
| 2336 | 2927 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t)) |
| 1168 | 2928 |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2929 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
|
2930 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
|
2931 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
|
2932 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t)); |
| 2396 | 2933 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
|
2934 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
2935 |
| 1168 | 2936 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
|
2937 h->slice_table= h->slice_table_base + s->mb_stride + 1; |
| 1168 | 2938 |
|
2641
c337f851d0f9
fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents:
2640
diff
changeset
|
2939 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
|
2940 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint32_t)); |
| 1168 | 2941 for(y=0; y<s->mb_height; y++){ |
| 2942 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
|
2943 const int mb_xy= x + y*s->mb_stride; |
| 1168 | 2944 const int b_xy = 4*x + 4*y*h->b_stride; |
| 2945 const int b8_xy= 2*x + 2*y*h->b8_stride; | |
| 2946 | |
| 2947 h->mb2b_xy [mb_xy]= b_xy; | |
| 2948 h->mb2b8_xy[mb_xy]= b8_xy; | |
| 2949 } | |
| 2950 } | |
| 2415 | 2951 |
| 2755 | 2952 CHECKED_ALLOCZ(h->dequant8_coeff, 52*64 * sizeof(uint16_t)); |
| 2953 for(q=0; q<52; q++){ | |
| 2954 int shift = div6[q]; | |
| 2955 int idx = rem6[q]; | |
| 2956 if(shift >= 2) // qp<12 are shifted during dequant | |
| 2957 shift -= 2; | |
| 2958 for(x=0; x<64; x++) | |
| 2959 h->dequant8_coeff[q][x] = dequant8_coeff_init[idx][ | |
| 2960 dequant8_coeff_init_scan[(x>>1)&12 | x&3] ] << shift; | |
| 2961 } | |
| 2962 | |
| 2417 | 2963 s->obmc_scratchpad = NULL; |
| 2964 | |
| 1168 | 2965 return 0; |
| 2966 fail: | |
| 2967 free_tables(h); | |
| 2968 return -1; | |
| 2969 } | |
| 2970 | |
| 2971 static void common_init(H264Context *h){ | |
| 2972 MpegEncContext * const s = &h->s; | |
| 2973 | |
| 2974 s->width = s->avctx->width; | |
| 2975 s->height = s->avctx->height; | |
| 2976 s->codec_id= s->avctx->codec->id; | |
| 2977 | |
| 2978 init_pred_ptrs(h); | |
| 2979 | |
| 1698 | 2980 s->unrestricted_mv=1; |
| 1168 | 2981 s->decode=1; //FIXME |
| 2982 } | |
| 2983 | |
| 2984 static int decode_init(AVCodecContext *avctx){ | |
| 2985 H264Context *h= avctx->priv_data; | |
| 2986 MpegEncContext * const s = &h->s; | |
| 2987 | |
| 1892 | 2988 MPV_decode_defaults(s); |
| 2989 | |
| 1168 | 2990 s->avctx = avctx; |
| 2991 common_init(h); | |
| 2992 | |
| 2993 s->out_format = FMT_H264; | |
| 2994 s->workaround_bugs= avctx->workaround_bugs; | |
| 2995 | |
| 2996 // set defaults | |
| 2997 // s->decode_mb= ff_h263_decode_mb; | |
| 2998 s->low_delay= 1; | |
| 2999 avctx->pix_fmt= PIX_FMT_YUV420P; | |
| 3000 | |
| 3001 decode_init_vlc(h); | |
| 3002 | |
|
2547
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
3003 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
|
3004 *(char *)avctx->extradata == 1){ |
| 2227 | 3005 h->is_avc = 1; |
| 3006 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
|
3007 } else { |
|
c5781912ad8a
improved detection of "AVC1" style H.264 patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2538
diff
changeset
|
3008 h->is_avc = 0; |
| 2227 | 3009 } |
| 3010 | |
| 1168 | 3011 return 0; |
| 3012 } | |
| 3013 | |
| 3014 static void frame_start(H264Context *h){ | |
| 3015 MpegEncContext * const s = &h->s; | |
| 3016 int i; | |
| 3017 | |
| 3018 MPV_frame_start(s, s->avctx); | |
| 3019 ff_er_frame_start(s); | |
| 3020 | |
| 3021 assert(s->linesize && s->uvlinesize); | |
| 3022 | |
| 3023 for(i=0; i<16; i++){ | |
| 3024 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
|
3025 h->block_offset[24+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->linesize*((scan8[i] - scan8[0])>>3); |
| 1168 | 3026 } |
| 3027 for(i=0; i<4; i++){ | |
| 3028 h->block_offset[16+i]= | |
| 3029 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
|
3030 h->block_offset[24+16+i]= |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3031 h->block_offset[24+20+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->uvlinesize*((scan8[i] - scan8[0])>>3); |
| 1168 | 3032 } |
| 3033 | |
|
2416
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
3034 /* 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
|
3035 * 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
|
3036 if(!s->obmc_scratchpad) |
|
06b7d678b582
10l: scratchpad could be allocated before its size was known.
lorenm
parents:
2415
diff
changeset
|
3037 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
|
3038 |
| 1168 | 3039 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1; |
| 3040 } | |
| 3041 | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3042 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
|
3043 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
|
3044 int i; |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3045 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3046 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
|
3047 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
|
3048 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
|
3049 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3050 // 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
|
3051 // 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
|
3052 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
|
3053 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
|
3054 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
|
3055 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3056 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3057 *(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
|
3058 *(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
|
3059 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3060 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
|
3061 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
|
3062 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
|
3063 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
|
3064 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
|
3065 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
|
3066 } |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3067 *(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
|
3068 *(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
|
3069 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3070 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3071 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3072 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
|
3073 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
|
3074 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
|
3075 uint64_t temp64; |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3076 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
|
3077 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
|
3078 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3079 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
|
3080 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
|
3081 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
|
3082 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3083 #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
|
3084 t= a;\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3085 if(xchg)\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3086 a= b;\ |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3087 b= t; |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3088 |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3089 if(deblock_left){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3090 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
|
3091 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
|
3092 } |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3093 } |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3094 |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3095 if(deblock_top){ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3096 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
|
3097 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1); |
| 2755 | 3098 if(s->mb_x < s->mb_width){ |
| 3099 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1); | |
| 3100 } | |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3101 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3102 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3103 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
|
3104 if(deblock_left){ |
|
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3105 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
|
3106 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
|
3107 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
|
3108 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3109 } |
|
2200
733c60a6e30c
h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2175
diff
changeset
|
3110 if(deblock_top){ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3111 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
|
3112 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
|
3113 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3114 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3115 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3116 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3117 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
|
3118 MpegEncContext * const s = &h->s; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3119 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3120 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3121 src_y -= 2 * linesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3122 src_cb -= 2 * uvlinesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3123 src_cr -= 2 * uvlinesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3124 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3125 // 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
|
3126 // 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
|
3127 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
|
3128 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
|
3129 for(i=2; i<34; i++){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3130 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
|
3131 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3132 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3133 *(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
|
3134 *(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
|
3135 *(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
|
3136 *(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
|
3137 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3138 if(!(s->flags&CODEC_FLAG_GRAY)){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3139 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
|
3140 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
|
3141 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
|
3142 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
|
3143 for(i=2; i<18; i++){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3144 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
|
3145 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
|
3146 } |
|
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]+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
|
3148 *(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
|
3149 *(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
|
3150 *(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
|
3151 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3152 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3153 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3154 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
|
3155 MpegEncContext * const s = &h->s; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3156 int temp8, i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3157 uint64_t temp64; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3158 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
|
3159 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
|
3160 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3161 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
|
3162 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3163 src_y -= 2 * linesize + 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3164 src_cb -= 2 * uvlinesize + 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3165 src_cr -= 2 * uvlinesize + 1; |
|
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 #define XCHG(a,b,t,xchg)\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3168 t= a;\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3169 if(xchg)\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3170 a= b;\ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3171 b= t; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3172 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3173 if(deblock_left){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3174 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
|
3175 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
|
3176 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3177 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3178 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3179 if(deblock_top){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3180 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
|
3181 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
|
3182 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
|
3183 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
|
3184 } |
|
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(!(s->flags&CODEC_FLAG_GRAY)){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3187 if(deblock_left){ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3188 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
|
3189 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
|
3190 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
|
3191 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3192 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3193 if(deblock_top){ |
|
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]+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
|
3195 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
|
3196 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
|
3197 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
|
3198 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3199 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3200 } |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3201 |
| 1168 | 3202 static void hl_decode_mb(H264Context *h){ |
| 3203 MpegEncContext * const s = &h->s; | |
| 3204 const int mb_x= s->mb_x; | |
| 3205 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
|
3206 const int mb_xy= mb_x + mb_y*s->mb_stride; |
| 1168 | 3207 const int mb_type= s->current_picture.mb_type[mb_xy]; |
| 3208 uint8_t *dest_y, *dest_cb, *dest_cr; | |
| 3209 int linesize, uvlinesize /*dct_offset*/; | |
| 3210 int i; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3211 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
|
3212 const unsigned int bottom = mb_y & 1; |
| 1168 | 3213 |
| 3214 if(!s->decode) | |
| 3215 return; | |
| 3216 | |
| 3217 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16; | |
| 3218 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 3219 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8; | |
| 3220 | |
| 3221 if (h->mb_field_decoding_flag) { | |
| 3222 linesize = s->linesize * 2; | |
| 3223 uvlinesize = s->uvlinesize * 2; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3224 block_offset = &h->block_offset[24]; |
| 1168 | 3225 if(mb_y&1){ //FIXME move out of this func? |
| 3226 dest_y -= s->linesize*15; | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3227 dest_cb-= s->uvlinesize*7; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
3228 dest_cr-= s->uvlinesize*7; |
| 1168 | 3229 } |
| 3230 } else { | |
| 3231 linesize = s->linesize; | |
| 3232 uvlinesize = s->uvlinesize; | |
| 3233 // dct_offset = s->linesize * 16; | |
| 3234 } | |
| 3235 | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3236 if (IS_INTRA_PCM(mb_type)) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3237 unsigned int x, y; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3238 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3239 // 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
|
3240 // 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
|
3241 for(i=0; i<16; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3242 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3243 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
|
3244 *(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
|
3245 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3246 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3247 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3248 for(i=16; i<16+4; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3249 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3250 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
|
3251 *(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
|
3252 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3253 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3254 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3255 for(i=20; i<20+4; i++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3256 for (y=0; y<4; y++) { |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3257 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
|
3258 *(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
|
3259 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3260 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
3261 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3262 } else { |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3263 if(IS_INTRA(mb_type)){ |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3264 if(h->deblocking_filter) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3265 if (h->mb_aff_frame) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3266 if (!bottom) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3267 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
|
3268 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3269 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
|
3270 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3271 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3272 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3273 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
|
3274 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
|
3275 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
|
3276 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3277 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3278 if(IS_INTRA4x4(mb_type)){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3279 if(!s->encoding){ |
| 2755 | 3280 if(IS_8x8DCT(mb_type)){ |
| 3281 for(i=0; i<16; i+=4){ | |
| 3282 uint8_t * const ptr= dest_y + block_offset[i]; | |
| 3283 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ]; | |
| 3284 h->pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000, | |
| 3285 (h->topright_samples_available<<(i+1))&0x8000, linesize); | |
| 3286 if(h->non_zero_count_cache[ scan8[i] ]) | |
| 3287 s->dsp.h264_idct8_add(ptr, h->mb + i*16, linesize); | |
| 3288 } | |
| 3289 }else | |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3290 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
|
3291 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
|
3292 uint8_t *topright; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3293 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
|
3294 int tr; |
|
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 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
|
3297 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
|
3298 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
|
3299 if(!topright_avail){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3300 tr= ptr[3 - linesize]*0x01010101; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3301 topright= (uint8_t*) &tr; |
| 2755 | 3302 }else |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3303 topright= ptr + 4 - linesize; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3304 }else |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3305 topright= NULL; |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3306 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3307 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
|
3308 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
|
3309 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
|
3310 s->dsp.h264_idct_add(ptr, h->mb + i*16, linesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3311 else |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3312 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
|
3313 } |
|
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 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3316 }else{ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3317 h->pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3318 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
|
3319 h264_luma_dc_dequant_idct_c(h->mb, s->qscale); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3320 else |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3321 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
|
3322 } |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3323 if(h->deblocking_filter) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3324 if (h->mb_aff_frame) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3325 if (bottom) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3326 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
|
3327 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
|
3328 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
|
3329 s->mb_y--; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3330 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
|
3331 s->mb_y++; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3332 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3333 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3334 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
|
3335 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3336 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3337 }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
|
3338 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
|
3339 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
|
3340 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
|
3341 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
|
3342 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3343 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3344 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3345 if(!IS_INTRA4x4(mb_type)){ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3346 if(s->codec_id == CODEC_ID_H264){ |
| 2755 | 3347 const int di = IS_8x8DCT(mb_type) ? 4 : 1; |
| 3348 void (*idct)(uint8_t *dst, DCTELEM *block, int stride) = | |
| 3349 IS_8x8DCT(mb_type) ? s->dsp.h264_idct8_add : s->dsp.h264_idct_add; | |
| 3350 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
|
3351 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
|
3352 uint8_t * const ptr= dest_y + block_offset[i]; |
| 2755 | 3353 idct(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
|
3354 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3355 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3356 }else{ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3357 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
|
3358 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
|
3359 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
|
3360 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0); |
| 1234 | 3361 } |
| 1168 | 3362 } |
| 3363 } | |
|
2509
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 |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3366 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
|
3367 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3368 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3369 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
|
3370 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
|
3371 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
|
3372 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
|
3373 s->dsp.h264_idct_add(ptr, h->mb + i*16, uvlinesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3374 } |
| 1250 | 3375 } |
|
2509
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3376 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
|
3377 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
|
3378 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
|
3379 s->dsp.h264_idct_add(ptr, h->mb + i*16, uvlinesize); |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3380 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3381 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3382 }else{ |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3383 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
|
3384 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
|
3385 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
|
3386 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
|
3387 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3388 } |
|
b3b06ba8787c
remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents:
2504
diff
changeset
|
3389 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
|
3390 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
|
3391 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
|
3392 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
|
3393 } |
| 1250 | 3394 } |
| 1168 | 3395 } |
| 3396 } | |
| 3397 } | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3398 if(h->deblocking_filter) { |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3399 if (h->mb_aff_frame) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3400 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
|
3401 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
|
3402 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
|
3403 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
|
3404 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
|
3405 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
|
3406 if (!bottom) return; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3407 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
|
3408 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
|
3409 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
|
3410 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3411 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
|
3412 // TODO deblock a pair |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3413 // top |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3414 s->mb_y--; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3415 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
|
3416 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
|
3417 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
|
3418 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
|
3419 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
|
3420 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3421 // bottom |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3422 s->mb_y++; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3423 tprintf("call mbaff filter_mb\n"); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3424 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
|
3425 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
|
3426 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
|
3427 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
|
3428 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3429 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3430 tprintf("call filter_mb\n"); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
3431 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
|
3432 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
|
3433 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
|
3434 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
3435 } |
| 1168 | 3436 } |
| 3437 | |
| 3438 /** | |
| 3439 * fills the default_ref_list. | |
| 3440 */ | |
| 3441 static int fill_default_ref_list(H264Context *h){ | |
| 3442 MpegEncContext * const s = &h->s; | |
| 3443 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
|
3444 int smallest_poc_greater_than_current = -1; |
| 2582 | 3445 Picture sorted_short_ref[32]; |
| 1168 | 3446 |
| 3447 if(h->slice_type==B_TYPE){ | |
| 3448 int out_i; | |
| 2713 | 3449 int limit= INT_MIN; |
| 1168 | 3450 |
|
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
|
3451 /* sort frame according to poc in B slice */ |
| 1168 | 3452 for(out_i=0; out_i<h->short_ref_count; out_i++){ |
| 2713 | 3453 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
|
3454 int best_poc=INT_MAX; |
| 1168 | 3455 |
| 3456 for(i=0; i<h->short_ref_count; i++){ | |
| 3457 const int poc= h->short_ref[i]->poc; | |
| 3458 if(poc > limit && poc < best_poc){ | |
| 3459 best_poc= poc; | |
| 3460 best_i= i; | |
| 3461 } | |
| 3462 } | |
| 3463 | |
| 2713 | 3464 assert(best_i != INT_MIN); |
| 1168 | 3465 |
| 3466 limit= best_poc; | |
| 3467 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
|
3468 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
|
3469 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
|
3470 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
|
3471 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
|
3472 } |
|
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
|
3473 } |
| 1168 | 3474 } |
| 3475 } | |
| 3476 | |
| 3477 if(s->picture_structure == PICT_FRAME){ | |
| 3478 if(h->slice_type==B_TYPE){ | |
| 3479 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
|
3480 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
|
3481 |
|
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
|
3482 // find the largest poc |
| 1168 | 3483 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
|
3484 int index = 0; |
| 2447 | 3485 int j= -99; |
| 3486 int step= list ? -1 : 1; | |
| 3487 | |
| 3488 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++, j+=step) { | |
| 3489 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
|
3490 if(j != -99 && step == (list ? -1 : 1)) |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3491 return -1; |
| 2447 | 3492 step = -step; |
| 3493 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
|
3494 } |
| 2447 | 3495 if(sorted_short_ref[j].reference != 3) continue; |
| 3496 h->default_ref_list[list][index ]= sorted_short_ref[j]; | |
| 3497 h->default_ref_list[list][index++].pic_id= sorted_short_ref[j].frame_num; | |
| 1168 | 3498 } |
| 3499 | |
|
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
|
3500 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
|
3501 if(h->long_ref[i] == NULL) continue; |
| 1168 | 3502 if(h->long_ref[i]->reference != 3) continue; |
| 3503 | |
| 3504 h->default_ref_list[ list ][index ]= *h->long_ref[i]; | |
| 3505 h->default_ref_list[ list ][index++].pic_id= i;; | |
| 3506 } | |
| 3507 | |
| 2447 | 3508 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
|
3509 // 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
|
3510 // L0 and L1 are identical |
| 1168 | 3511 Picture temp= h->default_ref_list[1][0]; |
| 3512 h->default_ref_list[1][0] = h->default_ref_list[1][1]; | |
| 2673 | 3513 h->default_ref_list[1][1] = temp; |
| 1168 | 3514 } |
| 3515 | |
| 3516 if(index < h->ref_count[ list ]) | |
| 3517 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index)); | |
| 3518 } | |
| 3519 }else{ | |
| 3520 int index=0; | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3521 for(i=0; i<h->short_ref_count; i++){ |
| 1168 | 3522 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit |
| 3523 h->default_ref_list[0][index ]= *h->short_ref[i]; | |
| 3524 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num; | |
| 3525 } | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3526 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
|
3527 if(h->long_ref[i] == NULL) continue; |
| 1168 | 3528 if(h->long_ref[i]->reference != 3) continue; |
| 3529 h->default_ref_list[0][index ]= *h->long_ref[i]; | |
| 3530 h->default_ref_list[0][index++].pic_id= i;; | |
| 3531 } | |
| 3532 if(index < h->ref_count[0]) | |
| 3533 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index)); | |
| 3534 } | |
| 3535 }else{ //FIELD | |
| 3536 if(h->slice_type==B_TYPE){ | |
| 3537 }else{ | |
| 3538 //FIXME second field balh | |
| 3539 } | |
| 3540 } | |
|
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
|
3541 #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
|
3542 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
|
3543 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
|
3544 } |
|
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
|
3545 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
|
3546 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
|
3547 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
|
3548 } |
|
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
|
3549 } |
|
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
|
3550 #endif |
| 1168 | 3551 return 0; |
| 3552 } | |
| 3553 | |
|
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
|
3554 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
|
3555 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
|
3556 |
| 1168 | 3557 static int decode_ref_pic_list_reordering(H264Context *h){ |
| 3558 MpegEncContext * const s = &h->s; | |
|
2680
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3559 int list, index; |
| 1168 | 3560 |
|
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
|
3561 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
|
3562 print_long_term(h); |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3563 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move before func |
| 1168 | 3564 |
| 3565 for(list=0; list<2; list++){ | |
| 3566 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]); | |
| 3567 | |
| 3568 if(get_bits1(&s->gb)){ | |
| 3569 int pred= h->curr_pic_num; | |
| 3570 | |
| 3571 for(index=0; ; index++){ | |
| 3572 int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb); | |
| 3573 int pic_id; | |
| 3574 int i; | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3575 Picture *ref = NULL; |
| 1168 | 3576 |
|
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3577 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
|
3578 break; |
| 1168 | 3579 |
| 3580 if(index >= h->ref_count[list]){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3581 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n"); |
| 1168 | 3582 return -1; |
| 3583 } | |
| 3584 | |
| 3585 if(reordering_of_pic_nums_idc<3){ | |
| 3586 if(reordering_of_pic_nums_idc<2){ | |
| 3587 const int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1; | |
| 3588 | |
| 3589 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
|
3590 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n"); |
| 1168 | 3591 return -1; |
| 3592 } | |
| 3593 | |
| 3594 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num; | |
| 3595 else pred+= abs_diff_pic_num; | |
| 3596 pred &= h->max_pic_num - 1; | |
| 3597 | |
| 2683 | 3598 for(i= h->short_ref_count-1; i>=0; i--){ |
| 3599 ref = h->short_ref[i]; | |
| 3600 assert(ref->reference == 3); | |
| 3601 assert(!ref->long_ref); | |
| 3602 if(ref->data[0] != NULL && ref->frame_num == pred && ref->long_ref == 0) // ignore non existing pictures by testing data[0] pointer | |
| 1168 | 3603 break; |
| 3604 } | |
| 2683 | 3605 if(i>=0) |
| 3606 ref->pic_id= ref->frame_num; | |
| 1168 | 3607 }else{ |
| 3608 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx | |
| 2683 | 3609 ref = h->long_ref[pic_id]; |
| 3610 ref->pic_id= pic_id; | |
| 3611 assert(ref->reference == 3); | |
| 3612 assert(ref->long_ref); | |
| 3613 i=0; | |
| 1168 | 3614 } |
| 3615 | |
|
2485
2844b8cf4e11
H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents:
2484
diff
changeset
|
3616 if (i < 0) { |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3617 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n"); |
| 1168 | 3618 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME |
| 2683 | 3619 } else { |
| 3620 for(i=index; i+1<h->ref_count[list]; i++){ | |
| 3621 if(ref->long_ref == h->ref_list[list][i].long_ref && ref->pic_id == h->ref_list[list][i].pic_id) | |
| 3622 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
|
3623 } |
|
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
|
3624 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
|
3625 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
|
3626 } |
| 2683 | 3627 h->ref_list[list][index]= *ref; |
| 1168 | 3628 } |
|
2284
6d26e105f68f
h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2272
diff
changeset
|
3629 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3630 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n"); |
| 1168 | 3631 return -1; |
| 3632 } | |
| 3633 } | |
| 3634 } | |
| 3635 | |
| 3636 if(h->slice_type!=B_TYPE) break; | |
| 3637 } | |
|
2680
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3638 for(list=0; list<2; list++){ |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3639 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
|
3640 if(!h->ref_list[list][index].data[0]) |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3641 h->ref_list[list][index]= s->current_picture; |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3642 } |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3643 if(h->slice_type!=B_TYPE) break; |
|
1a6192e0b1f9
fill missing reference pictures with something to avoid assertion failure
michael
parents:
2675
diff
changeset
|
3644 } |
| 2396 | 3645 |
| 3646 if(h->slice_type==B_TYPE && !h->direct_spatial_mv_pred) | |
| 3647 direct_dist_scale_factor(h); | |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
3648 direct_ref_list_init(h); |
| 1168 | 3649 return 0; |
| 3650 } | |
| 3651 | |
| 3652 static int pred_weight_table(H264Context *h){ | |
| 3653 MpegEncContext * const s = &h->s; | |
| 3654 int list, i; | |
| 2415 | 3655 int luma_def, chroma_def; |
| 1168 | 3656 |
| 2415 | 3657 h->use_weight= 0; |
| 3658 h->use_weight_chroma= 0; | |
| 1168 | 3659 h->luma_log2_weight_denom= get_ue_golomb(&s->gb); |
| 3660 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb); | |
| 2415 | 3661 luma_def = 1<<h->luma_log2_weight_denom; |
| 3662 chroma_def = 1<<h->chroma_log2_weight_denom; | |
| 1168 | 3663 |
| 3664 for(list=0; list<2; list++){ | |
| 3665 for(i=0; i<h->ref_count[list]; i++){ | |
| 3666 int luma_weight_flag, chroma_weight_flag; | |
| 3667 | |
| 3668 luma_weight_flag= get_bits1(&s->gb); | |
| 3669 if(luma_weight_flag){ | |
| 3670 h->luma_weight[list][i]= get_se_golomb(&s->gb); | |
| 3671 h->luma_offset[list][i]= get_se_golomb(&s->gb); | |
| 2415 | 3672 if( h->luma_weight[list][i] != luma_def |
| 3673 || h->luma_offset[list][i] != 0) | |
| 3674 h->use_weight= 1; | |
| 3675 }else{ | |
| 3676 h->luma_weight[list][i]= luma_def; | |
| 3677 h->luma_offset[list][i]= 0; | |
| 1168 | 3678 } |
| 3679 | |
| 3680 chroma_weight_flag= get_bits1(&s->gb); | |
| 3681 if(chroma_weight_flag){ | |
| 3682 int j; | |
| 3683 for(j=0; j<2; j++){ | |
| 3684 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb); | |
| 3685 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb); | |
| 2415 | 3686 if( h->chroma_weight[list][i][j] != chroma_def |
| 3687 || h->chroma_offset[list][i][j] != 0) | |
| 3688 h->use_weight_chroma= 1; | |
| 3689 } | |
| 3690 }else{ | |
| 3691 int j; | |
| 3692 for(j=0; j<2; j++){ | |
| 3693 h->chroma_weight[list][i][j]= chroma_def; | |
| 3694 h->chroma_offset[list][i][j]= 0; | |
| 1168 | 3695 } |
| 3696 } | |
| 3697 } | |
| 3698 if(h->slice_type != B_TYPE) break; | |
| 3699 } | |
| 2415 | 3700 h->use_weight= h->use_weight || h->use_weight_chroma; |
| 1168 | 3701 return 0; |
| 3702 } | |
| 3703 | |
| 2415 | 3704 static void implicit_weight_table(H264Context *h){ |
| 3705 MpegEncContext * const s = &h->s; | |
| 3706 int ref0, ref1; | |
| 3707 int cur_poc = s->current_picture_ptr->poc; | |
| 3708 | |
| 3709 if( h->ref_count[0] == 1 && h->ref_count[1] == 1 | |
| 3710 && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){ | |
| 3711 h->use_weight= 0; | |
| 3712 h->use_weight_chroma= 0; | |
| 3713 return; | |
| 3714 } | |
| 3715 | |
| 3716 h->use_weight= 2; | |
| 3717 h->use_weight_chroma= 2; | |
| 3718 h->luma_log2_weight_denom= 5; | |
| 3719 h->chroma_log2_weight_denom= 5; | |
| 3720 | |
| 3721 /* FIXME: MBAFF */ | |
| 3722 for(ref0=0; ref0 < h->ref_count[0]; ref0++){ | |
| 3723 int poc0 = h->ref_list[0][ref0].poc; | |
| 3724 for(ref1=0; ref1 < h->ref_count[1]; ref1++){ | |
| 2519 | 3725 int poc1 = h->ref_list[1][ref1].poc; |
| 2415 | 3726 int td = clip(poc1 - poc0, -128, 127); |
| 3727 if(td){ | |
| 3728 int tb = clip(cur_poc - poc0, -128, 127); | |
| 3729 int tx = (16384 + (ABS(td) >> 1)) / td; | |
| 3730 int dist_scale_factor = clip((tb*tx + 32) >> 6, -1024, 1023) >> 2; | |
| 3731 if(dist_scale_factor < -64 || dist_scale_factor > 128) | |
| 3732 h->implicit_weight[ref0][ref1] = 32; | |
| 3733 else | |
| 3734 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor; | |
| 3735 }else | |
| 3736 h->implicit_weight[ref0][ref1] = 32; | |
| 3737 } | |
| 3738 } | |
| 3739 } | |
| 3740 | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3741 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
|
3742 int i; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3743 pic->reference=0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3744 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
|
3745 pic->reference=1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3746 else{ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3747 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
|
3748 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
|
3749 pic->reference=1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3750 break; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3751 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3752 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3753 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3754 |
| 1168 | 3755 /** |
| 2392 | 3756 * instantaneous decoder refresh. |
| 1168 | 3757 */ |
| 3758 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
|
3759 int i; |
| 1168 | 3760 |
|
2484
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3761 for(i=0; i<16; i++){ |
|
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3762 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
|
3763 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
|
3764 h->long_ref[i]= NULL; |
|
a3188eb4266c
correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents:
2471
diff
changeset
|
3765 } |
| 1168 | 3766 } |
| 3767 h->long_ref_count=0; | |
| 3768 | |
| 3769 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
|
3770 unreference_pic(h, h->short_ref[i]); |
| 1168 | 3771 h->short_ref[i]= NULL; |
| 3772 } | |
| 3773 h->short_ref_count=0; | |
| 3774 } | |
| 3775 | |
| 2640 | 3776 /* forget old pics after a seek */ |
| 3777 static void flush_dpb(AVCodecContext *avctx){ | |
| 3778 H264Context *h= avctx->priv_data; | |
| 3779 int i; | |
| 3780 for(i=0; i<16; i++) | |
| 3781 h->delayed_pic[i]= NULL; | |
| 3782 h->delayed_output_pic= NULL; | |
| 3783 idr(h); | |
|
2751
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
3784 if(h->s.current_picture_ptr) |
|
3247049dfc7a
fix segfault if flush is called before the first frame
mru
parents:
2748
diff
changeset
|
3785 h->s.current_picture_ptr->reference= 0; |
| 2640 | 3786 } |
| 3787 | |
| 1168 | 3788 /** |
| 3789 * | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3790 * @return the removed picture or NULL if an error occurs |
| 1168 | 3791 */ |
| 3792 static Picture * remove_short(H264Context *h, int frame_num){ | |
| 1169 | 3793 MpegEncContext * const s = &h->s; |
| 1168 | 3794 int i; |
| 3795 | |
| 1169 | 3796 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
|
3797 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count); |
| 1169 | 3798 |
| 1168 | 3799 for(i=0; i<h->short_ref_count; i++){ |
| 3800 Picture *pic= h->short_ref[i]; | |
| 1169 | 3801 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
|
3802 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic); |
| 1168 | 3803 if(pic->frame_num == frame_num){ |
| 3804 h->short_ref[i]= NULL; | |
| 3805 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*)); | |
| 3806 h->short_ref_count--; | |
| 3807 return pic; | |
| 3808 } | |
| 3809 } | |
| 3810 return NULL; | |
| 3811 } | |
| 3812 | |
| 3813 /** | |
| 3814 * | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
3815 * @return the removed picture or NULL if an error occurs |
| 1168 | 3816 */ |
| 3817 static Picture * remove_long(H264Context *h, int i){ | |
| 3818 Picture *pic; | |
| 3819 | |
| 3820 pic= h->long_ref[i]; | |
| 3821 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
|
3822 if(pic) h->long_ref_count--; |
| 1168 | 3823 |
| 3824 return pic; | |
| 3825 } | |
| 3826 | |
| 3827 /** | |
|
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
|
3828 * 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
|
3829 */ |
|
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
|
3830 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
|
3831 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
|
3832 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
|
3833 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
|
3834 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
|
3835 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
|
3836 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
|
3837 } |
|
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
|
3838 } |
|
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
|
3839 } |
|
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
|
3840 |
|
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
|
3841 /** |
|
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
|
3842 * 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
|
3843 */ |
|
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
|
3844 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
|
3845 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
|
3846 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
|
3847 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
|
3848 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
|
3849 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
|
3850 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
|
3851 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
|
3852 } |
|
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 } |
|
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 } |
|
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 } |
|
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 |
|
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 /** |
| 1168 | 3858 * Executes the reference picture marking (memory management control operations). |
| 3859 */ | |
| 3860 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ | |
| 3861 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
|
3862 int i, j; |
| 1168 | 3863 int current_is_long=0; |
| 3864 Picture *pic; | |
| 3865 | |
| 3866 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
|
3867 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n"); |
| 1168 | 3868 |
| 3869 for(i=0; i<mmco_count; i++){ | |
| 3870 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
|
3871 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 | 3872 |
| 3873 switch(mmco[i].opcode){ | |
| 3874 case MMCO_SHORT2UNUSED: | |
| 3875 pic= remove_short(h, mmco[i].short_frame_num); | |
| 3876 if(pic==NULL) return -1; | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3877 unreference_pic(h, pic); |
| 1168 | 3878 break; |
| 3879 case MMCO_SHORT2LONG: | |
| 3880 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
|
3881 if(pic) unreference_pic(h, pic); |
| 1168 | 3882 |
| 3883 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num); | |
| 3884 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
|
3885 h->long_ref_count++; |
| 1168 | 3886 break; |
| 3887 case MMCO_LONG2UNUSED: | |
| 3888 pic= remove_long(h, mmco[i].long_index); | |
| 3889 if(pic==NULL) return -1; | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3890 unreference_pic(h, pic); |
| 1168 | 3891 break; |
| 3892 case MMCO_LONG: | |
| 3893 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
|
3894 if(pic) unreference_pic(h, pic); |
| 1168 | 3895 |
| 3896 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr; | |
| 3897 h->long_ref[ mmco[i].long_index ]->long_ref=1; | |
| 3898 h->long_ref_count++; | |
| 3899 | |
| 3900 current_is_long=1; | |
| 3901 break; | |
| 3902 case MMCO_SET_MAX_LONG: | |
| 3903 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
|
3904 // 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
|
3905 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
|
3906 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
|
3907 if (pic) unreference_pic(h, pic); |
| 1168 | 3908 } |
| 3909 break; | |
| 3910 case MMCO_RESET: | |
| 3911 while(h->short_ref_count){ | |
| 3912 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
|
3913 unreference_pic(h, pic); |
| 1168 | 3914 } |
|
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
|
3915 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
|
3916 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
|
3917 if(pic) unreference_pic(h, pic); |
| 1168 | 3918 } |
| 3919 break; | |
| 3920 default: assert(0); | |
| 3921 } | |
| 3922 } | |
| 3923 | |
| 3924 if(!current_is_long){ | |
| 3925 pic= remove_short(h, s->current_picture_ptr->frame_num); | |
| 3926 if(pic){ | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
3927 unreference_pic(h, pic); |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3928 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n"); |
| 1168 | 3929 } |
| 3930 | |
| 3931 if(h->short_ref_count) | |
| 1169 | 3932 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*)); |
| 3933 | |
| 3934 h->short_ref[0]= s->current_picture_ptr; | |
| 1168 | 3935 h->short_ref[0]->long_ref=0; |
| 3936 h->short_ref_count++; | |
| 3937 } | |
| 3938 | |
|
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
|
3939 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
|
3940 print_long_term(h); |
| 1168 | 3941 return 0; |
| 3942 } | |
| 3943 | |
| 3944 static int decode_ref_pic_marking(H264Context *h){ | |
| 3945 MpegEncContext * const s = &h->s; | |
| 3946 int i; | |
| 3947 | |
| 3948 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields | |
| 3949 s->broken_link= get_bits1(&s->gb) -1; | |
| 3950 h->mmco[0].long_index= get_bits1(&s->gb) - 1; // current_long_term_idx | |
| 3951 if(h->mmco[0].long_index == -1) | |
| 3952 h->mmco_index= 0; | |
| 3953 else{ | |
| 3954 h->mmco[0].opcode= MMCO_LONG; | |
| 3955 h->mmco_index= 1; | |
| 3956 } | |
| 3957 }else{ | |
| 3958 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
|
3959 for(i= 0; i<MAX_MMCO_COUNT; i++) { |
| 1168 | 3960 MMCOOpcode opcode= get_ue_golomb(&s->gb);; |
| 3961 | |
| 3962 h->mmco[i].opcode= opcode; | |
| 3963 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){ | |
| 3964 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 | |
| 3965 /* if(h->mmco[i].short_frame_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_frame_num ] == NULL){ | |
| 3966 fprintf(stderr, "illegal short ref in memory management control operation %d\n", mmco); | |
| 3967 return -1; | |
| 3968 }*/ | |
| 3969 } | |
| 3970 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){ | |
| 3971 h->mmco[i].long_index= get_ue_golomb(&s->gb); | |
| 3972 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
|
3973 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); |
| 1168 | 3974 return -1; |
| 3975 } | |
| 3976 } | |
| 3977 | |
| 3978 if(opcode > MMCO_LONG){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
3979 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); |
| 1168 | 3980 return -1; |
| 3981 } | |
|
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
|
3982 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
|
3983 break; |
| 1168 | 3984 } |
| 3985 h->mmco_index= i; | |
| 3986 }else{ | |
| 3987 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count); | |
| 3988 | |
| 3989 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields | |
| 3990 h->mmco[0].opcode= MMCO_SHORT2UNUSED; | |
| 3991 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num; | |
| 3992 h->mmco_index= 1; | |
| 3993 }else | |
| 3994 h->mmco_index= 0; | |
| 3995 } | |
| 3996 } | |
| 3997 | |
| 3998 return 0; | |
| 3999 } | |
| 4000 | |
| 4001 static int init_poc(H264Context *h){ | |
| 4002 MpegEncContext * const s = &h->s; | |
| 4003 const int max_frame_num= 1<<h->sps.log2_max_frame_num; | |
| 4004 int field_poc[2]; | |
| 4005 | |
| 4006 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 4007 h->frame_num_offset= 0; | |
| 4008 }else{ | |
| 4009 if(h->frame_num < h->prev_frame_num) | |
| 4010 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num; | |
| 4011 else | |
| 4012 h->frame_num_offset= h->prev_frame_num_offset; | |
| 4013 } | |
| 4014 | |
| 4015 if(h->sps.poc_type==0){ | |
| 4016 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb; | |
| 4017 | |
|
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
|
4018 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
|
4019 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
|
4020 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
|
4021 } |
|
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
|
4022 |
| 1168 | 4023 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2) |
| 4024 h->poc_msb = h->prev_poc_msb + max_poc_lsb; | |
| 4025 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2) | |
| 4026 h->poc_msb = h->prev_poc_msb - max_poc_lsb; | |
| 4027 else | |
| 4028 h->poc_msb = h->prev_poc_msb; | |
| 4029 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb); | |
| 4030 field_poc[0] = | |
| 4031 field_poc[1] = h->poc_msb + h->poc_lsb; | |
| 4032 if(s->picture_structure == PICT_FRAME) | |
| 4033 field_poc[1] += h->delta_poc_bottom; | |
| 4034 }else if(h->sps.poc_type==1){ | |
| 4035 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc; | |
| 4036 int i; | |
| 4037 | |
| 4038 if(h->sps.poc_cycle_length != 0) | |
| 4039 abs_frame_num = h->frame_num_offset + h->frame_num; | |
| 4040 else | |
| 4041 abs_frame_num = 0; | |
| 4042 | |
| 4043 if(h->nal_ref_idc==0 && abs_frame_num > 0) | |
| 4044 abs_frame_num--; | |
| 4045 | |
| 4046 expected_delta_per_poc_cycle = 0; | |
| 4047 for(i=0; i < h->sps.poc_cycle_length; i++) | |
| 4048 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse | |
| 4049 | |
| 4050 if(abs_frame_num > 0){ | |
| 4051 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length; | |
| 4052 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length; | |
| 4053 | |
| 4054 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle; | |
| 4055 for(i = 0; i <= frame_num_in_poc_cycle; i++) | |
| 4056 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ]; | |
| 4057 } else | |
| 4058 expectedpoc = 0; | |
| 4059 | |
| 4060 if(h->nal_ref_idc == 0) | |
| 4061 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic; | |
| 4062 | |
| 4063 field_poc[0] = expectedpoc + h->delta_poc[0]; | |
| 4064 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field; | |
| 4065 | |
| 4066 if(s->picture_structure == PICT_FRAME) | |
| 4067 field_poc[1] += h->delta_poc[1]; | |
| 4068 }else{ | |
| 4069 int poc; | |
| 4070 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 4071 poc= 0; | |
| 4072 }else{ | |
| 4073 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num); | |
| 4074 else poc= 2*(h->frame_num_offset + h->frame_num) - 1; | |
| 4075 } | |
| 4076 field_poc[0]= poc; | |
| 4077 field_poc[1]= poc; | |
| 4078 } | |
| 4079 | |
| 4080 if(s->picture_structure != PICT_BOTTOM_FIELD) | |
| 4081 s->current_picture_ptr->field_poc[0]= field_poc[0]; | |
| 4082 if(s->picture_structure != PICT_TOP_FIELD) | |
| 4083 s->current_picture_ptr->field_poc[1]= field_poc[1]; | |
| 4084 if(s->picture_structure == PICT_FRAME) // FIXME field pix? | |
| 4085 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]); | |
| 4086 | |
| 4087 return 0; | |
| 4088 } | |
| 4089 | |
| 4090 /** | |
| 4091 * decodes a slice header. | |
| 4092 * this will allso call MPV_common_init() and frame_start() as needed | |
| 4093 */ | |
| 4094 static int decode_slice_header(H264Context *h){ | |
| 4095 MpegEncContext * const s = &h->s; | |
| 4096 int first_mb_in_slice, pps_id; | |
| 4097 int num_ref_idx_active_override_flag; | |
| 4098 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
|
4099 int slice_type; |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4100 int default_ref_list_done = 0; |
| 1168 | 4101 |
| 4102 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
|
4103 s->dropable= h->nal_ref_idc == 0; |
| 1168 | 4104 |
| 4105 first_mb_in_slice= get_ue_golomb(&s->gb); | |
| 4106 | |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4107 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
|
4108 if(slice_type > 9){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4109 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 | 4110 return -1; |
| 1168 | 4111 } |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4112 if(slice_type > 4){ |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4113 slice_type -= 5; |
| 1168 | 4114 h->slice_type_fixed=1; |
| 4115 }else | |
| 4116 h->slice_type_fixed=0; | |
| 4117 | |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4118 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
|
4119 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
|
4120 || (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
|
4121 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
|
4122 } |
|
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4123 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
|
4124 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4125 s->pict_type= h->slice_type; // to make a few old func happy, it's wrong though |
| 1168 | 4126 |
| 4127 pps_id= get_ue_golomb(&s->gb); | |
| 4128 if(pps_id>255){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4129 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n"); |
| 1168 | 4130 return -1; |
| 4131 } | |
| 4132 h->pps= h->pps_buffer[pps_id]; | |
| 1174 | 4133 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
|
4134 av_log(h->s.avctx, AV_LOG_ERROR, "non existing PPS referenced\n"); |
| 1174 | 4135 return -1; |
| 4136 } | |
| 4137 | |
| 1168 | 4138 h->sps= h->sps_buffer[ h->pps.sps_id ]; |
| 1174 | 4139 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
|
4140 av_log(h->s.avctx, AV_LOG_ERROR, "non existing SPS referenced\n"); |
| 1174 | 4141 return -1; |
| 4142 } | |
| 1168 | 4143 |
| 4144 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
|
4145 s->mb_height= h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag); |
| 1168 | 4146 |
| 2395 | 4147 h->b_stride= s->mb_width*4 + 1; |
| 4148 h->b8_stride= s->mb_width*2 + 1; | |
| 1168 | 4149 |
| 1371 | 4150 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right ); |
| 1168 | 4151 if(h->sps.frame_mbs_only_flag) |
| 1371 | 4152 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom); |
| 1168 | 4153 else |
| 1371 | 4154 s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck |
| 1168 | 4155 |
| 4156 if (s->context_initialized | |
| 1548 | 4157 && ( s->width != s->avctx->width || s->height != s->avctx->height)) { |
| 1168 | 4158 free_tables(h); |
| 4159 MPV_common_end(s); | |
| 4160 } | |
| 4161 if (!s->context_initialized) { | |
| 4162 if (MPV_common_init(s) < 0) | |
| 4163 return -1; | |
|
2758
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4164 |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4165 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
|
4166 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
|
4167 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
|
4168 }else{ |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4169 int i; |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4170 for(i=0; i<16; i++){ |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4171 #define T(x) (x>>2) | ((x<<2) & 0xF) |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4172 h->zigzag_scan[i] = T(zigzag_scan[i]); |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4173 h-> field_scan[i] = T( field_scan[i]); |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4174 } |
|
a7925aaeea1e
10l (dont read variables before they have been set)
michael
parents:
2757
diff
changeset
|
4175 } |
| 1168 | 4176 |
| 4177 alloc_tables(h); | |
| 4178 | |
| 4179 s->avctx->width = s->width; | |
| 4180 s->avctx->height = s->height; | |
| 1548 | 4181 s->avctx->sample_aspect_ratio= h->sps.sar; |
| 2440 | 4182 if(!s->avctx->sample_aspect_ratio.den) |
| 4183 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
|
4184 |
| 2648 | 4185 if(h->sps.timing_info_present_flag){ |
| 2637 | 4186 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
|
4187 } |
| 1168 | 4188 } |
| 4189 | |
| 2392 | 4190 if(h->slice_num == 0){ |
| 1168 | 4191 frame_start(h); |
| 4192 } | |
| 4193 | |
| 1169 | 4194 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup |
| 1168 | 4195 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num); |
| 4196 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4197 h->mb_aff_frame = 0; |
| 1168 | 4198 if(h->sps.frame_mbs_only_flag){ |
| 4199 s->picture_structure= PICT_FRAME; | |
| 4200 }else{ | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4201 if(get_bits1(&s->gb)) { //field_pic_flag |
| 1168 | 4202 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
|
4203 } else { |
| 1168 | 4204 s->picture_structure= PICT_FRAME; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4205 first_mb_in_slice <<= 1; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4206 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
|
4207 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4208 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4209 |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4210 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
|
4211 s->resync_mb_y = s->mb_y = first_mb_in_slice / s->mb_width; |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4212 |
| 1168 | 4213 if(s->picture_structure==PICT_FRAME){ |
| 4214 h->curr_pic_num= h->frame_num; | |
| 4215 h->max_pic_num= 1<< h->sps.log2_max_frame_num; | |
| 4216 }else{ | |
| 4217 h->curr_pic_num= 2*h->frame_num; | |
| 4218 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); | |
| 4219 } | |
| 4220 | |
| 4221 if(h->nal_unit_type == NAL_IDR_SLICE){ | |
| 1453 | 4222 get_ue_golomb(&s->gb); /* idr_pic_id */ |
| 1168 | 4223 } |
| 4224 | |
| 4225 if(h->sps.poc_type==0){ | |
| 4226 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb); | |
| 4227 | |
| 4228 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){ | |
| 4229 h->delta_poc_bottom= get_se_golomb(&s->gb); | |
| 4230 } | |
| 4231 } | |
| 4232 | |
| 4233 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){ | |
| 4234 h->delta_poc[0]= get_se_golomb(&s->gb); | |
| 4235 | |
| 4236 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME) | |
| 4237 h->delta_poc[1]= get_se_golomb(&s->gb); | |
| 4238 } | |
| 4239 | |
| 4240 init_poc(h); | |
| 4241 | |
| 4242 if(h->pps.redundant_pic_cnt_present){ | |
| 4243 h->redundant_pic_count= get_ue_golomb(&s->gb); | |
| 4244 } | |
| 4245 | |
| 4246 //set defaults, might be overriden a few line later | |
| 4247 h->ref_count[0]= h->pps.ref_count[0]; | |
| 4248 h->ref_count[1]= h->pps.ref_count[1]; | |
| 4249 | |
| 4250 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){ | |
| 4251 if(h->slice_type == B_TYPE){ | |
| 4252 h->direct_spatial_mv_pred= get_bits1(&s->gb); | |
| 4253 } | |
| 4254 num_ref_idx_active_override_flag= get_bits1(&s->gb); | |
| 4255 | |
| 4256 if(num_ref_idx_active_override_flag){ | |
| 4257 h->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
| 4258 if(h->slice_type==B_TYPE) | |
| 4259 h->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
| 4260 | |
| 4261 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
|
4262 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n"); |
| 1168 | 4263 return -1; |
| 4264 } | |
| 4265 } | |
| 4266 } | |
| 4267 | |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
4268 if(!default_ref_list_done){ |
| 1168 | 4269 fill_default_ref_list(h); |
| 4270 } | |
| 4271 | |
| 4272 decode_ref_pic_list_reordering(h); | |
| 4273 | |
| 4274 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE )) | |
| 4275 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) ) | |
| 4276 pred_weight_table(h); | |
| 2415 | 4277 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE) |
| 4278 implicit_weight_table(h); | |
| 4279 else | |
| 4280 h->use_weight = 0; | |
| 1168 | 4281 |
|
2580
b4f6f89ec2f6
The cvs version 1.103 of h264.c brokes 13 conformance streams, this
michael
parents:
2561
diff
changeset
|
4282 if(s->current_picture.reference) |
| 1168 | 4283 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
|
4284 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4285 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
|
4286 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
|
4287 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4288 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
|
4289 s->qscale = h->pps.init_qp + get_se_golomb(&s->gb); |
| 1898 | 4290 if(s->qscale<0 || s->qscale>51){ |
| 4291 av_log(s->avctx, AV_LOG_ERROR, "QP %d out of range\n", s->qscale); | |
| 4292 return -1; | |
| 4293 } | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4294 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale); |
| 1168 | 4295 //FIXME qscale / qp ... stuff |
| 4296 if(h->slice_type == SP_TYPE){ | |
| 1453 | 4297 get_bits1(&s->gb); /* sp_for_switch_flag */ |
| 1168 | 4298 } |
| 4299 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){ | |
| 1453 | 4300 get_se_golomb(&s->gb); /* slice_qs_delta */ |
| 1168 | 4301 } |
| 4302 | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4303 h->deblocking_filter = 1; |
| 1898 | 4304 h->slice_alpha_c0_offset = 0; |
| 4305 h->slice_beta_offset = 0; | |
| 1168 | 4306 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
|
4307 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
|
4308 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
|
4309 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
|
4310 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
4311 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
|
4312 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
|
4313 h->slice_beta_offset = get_se_golomb(&s->gb) << 1; |
| 1168 | 4314 } |
|
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
|
4315 } |
| 1168 | 4316 |
| 4317 #if 0 //FMO | |
| 4318 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5) | |
| 4319 slice_group_change_cycle= get_bits(&s->gb, ?); | |
| 4320 #endif | |
| 4321 | |
| 2392 | 4322 h->slice_num++; |
| 4323 | |
| 1168 | 4324 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ |
| 2583 | 4325 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
|
4326 h->slice_num, |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4327 (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
|
4328 first_mb_in_slice, |
| 1264 | 4329 av_get_pict_type_char(h->slice_type), |
| 1168 | 4330 pps_id, h->frame_num, |
| 4331 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1], | |
| 4332 h->ref_count[0], h->ref_count[1], | |
| 4333 s->qscale, | |
| 2583 | 4334 h->deblocking_filter, h->slice_alpha_c0_offset/2, h->slice_beta_offset/2, |
| 2415 | 4335 h->use_weight, |
| 4336 h->use_weight==1 && h->use_weight_chroma ? "c" : "" | |
| 1168 | 4337 ); |
| 4338 } | |
| 4339 | |
| 4340 return 0; | |
| 4341 } | |
| 4342 | |
| 4343 /** | |
| 4344 * | |
| 4345 */ | |
| 4346 static inline int get_level_prefix(GetBitContext *gb){ | |
| 4347 unsigned int buf; | |
| 4348 int log; | |
| 4349 | |
| 4350 OPEN_READER(re, gb); | |
| 4351 UPDATE_CACHE(re, gb); | |
| 4352 buf=GET_CACHE(re, gb); | |
| 4353 | |
| 4354 log= 32 - av_log2(buf); | |
| 4355 #ifdef TRACE | |
| 4356 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
|
4357 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 | 4358 #endif |
| 4359 | |
| 4360 LAST_SKIP_BITS(re, gb, log); | |
| 4361 CLOSE_READER(re, gb); | |
| 4362 | |
| 4363 return log-1; | |
| 4364 } | |
| 4365 | |
| 2755 | 4366 static inline int get_dct8x8_allowed(H264Context *h){ |
| 4367 int i; | |
| 4368 for(i=0; i<4; i++){ | |
| 4369 if(!IS_SUB_8X8(h->sub_mb_type[i]) | |
| 4370 || !h->sps.direct_8x8_inference_flag && IS_DIRECT(h->sub_mb_type[i])) | |
| 4371 return 0; | |
| 4372 } | |
| 4373 return 1; | |
| 4374 } | |
| 4375 | |
| 1168 | 4376 /** |
| 4377 * decodes a residual block. | |
| 4378 * @param n block index | |
| 4379 * @param scantable scantable | |
| 4380 * @param max_coeff number of coefficients in the block | |
| 4381 * @return <0 if an error occured | |
| 4382 */ | |
| 2755 | 4383 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint16_t *qmul, int max_coeff){ |
| 1168 | 4384 MpegEncContext * const s = &h->s; |
| 4385 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}; | |
| 4386 int level[16], run[16]; | |
| 4387 int suffix_length, zeros_left, coeff_num, coeff_token, total_coeff, i, trailing_ones; | |
| 4388 | |
| 4389 //FIXME put trailing_onex into the context | |
| 4390 | |
| 4391 if(n == CHROMA_DC_BLOCK_INDEX){ | |
| 4392 coeff_token= get_vlc2(gb, chroma_dc_coeff_token_vlc.table, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 1); | |
| 4393 total_coeff= coeff_token>>2; | |
| 4394 }else{ | |
| 4395 if(n == LUMA_DC_BLOCK_INDEX){ | |
| 4396 total_coeff= pred_non_zero_count(h, 0); | |
| 4397 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
| 4398 total_coeff= coeff_token>>2; | |
| 4399 }else{ | |
| 4400 total_coeff= pred_non_zero_count(h, n); | |
| 4401 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2); | |
| 4402 total_coeff= coeff_token>>2; | |
| 4403 h->non_zero_count_cache[ scan8[n] ]= total_coeff; | |
| 4404 } | |
| 4405 } | |
| 4406 | |
| 4407 //FIXME set last_non_zero? | |
| 4408 | |
| 4409 if(total_coeff==0) | |
| 4410 return 0; | |
| 4411 | |
| 4412 trailing_ones= coeff_token&3; | |
| 1170 | 4413 tprintf("trailing:%d, total:%d\n", trailing_ones, total_coeff); |
| 1168 | 4414 assert(total_coeff<=16); |
| 4415 | |
| 4416 for(i=0; i<trailing_ones; i++){ | |
| 4417 level[i]= 1 - 2*get_bits1(gb); | |
| 4418 } | |
| 4419 | |
| 4420 suffix_length= total_coeff > 10 && trailing_ones < 3; | |
| 4421 | |
| 4422 for(; i<total_coeff; i++){ | |
| 4423 const int prefix= get_level_prefix(gb); | |
| 4424 int level_code, mask; | |
| 4425 | |
| 4426 if(prefix<14){ //FIXME try to build a large unified VLC table for all this | |
| 4427 if(suffix_length) | |
| 4428 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
| 4429 else | |
| 4430 level_code= (prefix<<suffix_length); //part | |
| 4431 }else if(prefix==14){ | |
| 4432 if(suffix_length) | |
| 4433 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part | |
| 4434 else | |
| 4435 level_code= prefix + get_bits(gb, 4); //part | |
| 4436 }else if(prefix==15){ | |
| 4437 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
|
4438 if(suffix_length==0) level_code+=15; //FIXME doesn't make (much)sense |
| 1168 | 4439 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4440 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 4441 return -1; |
| 4442 } | |
| 4443 | |
| 4444 if(i==trailing_ones && i<3) level_code+= 2; //FIXME split first iteration | |
| 4445 | |
| 4446 mask= -(level_code&1); | |
| 4447 level[i]= (((2+level_code)>>1) ^ mask) - mask; | |
| 4448 | |
| 4449 if(suffix_length==0) suffix_length=1; //FIXME split first iteration | |
| 4450 | |
| 4451 #if 1 | |
| 4452 if(ABS(level[i]) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++; | |
| 4453 #else | |
| 4454 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
|
4455 /* ? == prefix > 2 or sth */ |
| 1168 | 4456 #endif |
| 1170 | 4457 tprintf("level: %d suffix_length:%d\n", level[i], suffix_length); |
| 1168 | 4458 } |
| 4459 | |
| 4460 if(total_coeff == max_coeff) | |
| 4461 zeros_left=0; | |
| 4462 else{ | |
| 4463 if(n == CHROMA_DC_BLOCK_INDEX) | |
| 4464 zeros_left= get_vlc2(gb, chroma_dc_total_zeros_vlc[ total_coeff-1 ].table, CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 1); | |
| 4465 else | |
| 4466 zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1); | |
| 4467 } | |
| 4468 | |
| 4469 for(i=0; i<total_coeff-1; i++){ | |
| 4470 if(zeros_left <=0) | |
| 4471 break; | |
| 4472 else if(zeros_left < 7){ | |
| 4473 run[i]= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1); | |
| 4474 }else{ | |
| 4475 run[i]= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2); | |
| 4476 } | |
| 4477 zeros_left -= run[i]; | |
| 4478 } | |
| 4479 | |
| 4480 if(zeros_left<0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4481 av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y); |
| 1168 | 4482 return -1; |
| 4483 } | |
| 4484 | |
| 4485 for(; i<total_coeff-1; i++){ | |
| 4486 run[i]= 0; | |
| 4487 } | |
| 4488 | |
| 4489 run[i]= zeros_left; | |
| 4490 | |
| 4491 coeff_num=-1; | |
| 4492 if(n > 24){ | |
| 4493 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
| 4494 int j; | |
| 4495 | |
| 4496 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
| 4497 j= scantable[ coeff_num ]; | |
| 4498 | |
| 4499 block[j]= level[i]; | |
| 4500 } | |
| 4501 }else{ | |
| 4502 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode? | |
| 4503 int j; | |
| 4504 | |
| 4505 coeff_num += run[i] + 1; //FIXME add 1 earlier ? | |
| 4506 j= scantable[ coeff_num ]; | |
| 4507 | |
| 4508 block[j]= level[i] * qmul[j]; | |
| 4509 // printf("%d %d ", block[j], qmul[j]); | |
| 4510 } | |
| 4511 } | |
| 4512 return 0; | |
| 4513 } | |
| 4514 | |
| 4515 /** | |
| 2396 | 4516 * decodes a P_SKIP or B_SKIP macroblock |
| 4517 */ | |
| 4518 static void decode_mb_skip(H264Context *h){ | |
| 4519 MpegEncContext * const s = &h->s; | |
| 4520 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
|
4521 int mb_type=0; |
| 2396 | 4522 |
| 4523 memset(h->non_zero_count[mb_xy], 0, 16); | |
| 4524 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui | |
| 4525 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4526 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
|
4527 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
|
4528 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4529 if(h->mb_field_decoding_flag) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4530 mb_type|= MB_TYPE_INTERLACED; |
|
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4531 |
| 2396 | 4532 if( h->slice_type == B_TYPE ) |
| 4533 { | |
| 4534 // 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
|
4535 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP; |
| 2396 | 4536 |
| 2449 | 4537 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
| 2396 | 4538 pred_direct_motion(h, &mb_type); |
| 4539 if(h->pps.cabac){ | |
| 4540 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 4541 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 4542 } | |
| 4543 } | |
| 4544 else | |
| 4545 { | |
| 4546 int mx, my; | |
|
2674
58fb8e1efcae
10l (mb_type uninitalized and then changed and overwritten)
michael
parents:
2673
diff
changeset
|
4547 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; |
| 2396 | 4548 |
| 2449 | 4549 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... |
| 2396 | 4550 pred_pskip_motion(h, &mx, &my); |
| 4551 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
| 4552 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); | |
| 4553 if(h->pps.cabac) | |
| 4554 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 4555 } | |
| 4556 | |
| 4557 write_back_motion(h, mb_type); | |
| 4558 s->current_picture.mb_type[mb_xy]= mb_type|MB_TYPE_SKIP; | |
| 4559 s->current_picture.qscale_table[mb_xy]= s->qscale; | |
| 4560 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
|
4561 h->prev_mb_skipped= 1; |
| 2396 | 4562 } |
| 4563 | |
| 4564 /** | |
| 1168 | 4565 * decodes a macroblock |
| 4566 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed | |
| 4567 */ | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
4568 static int decode_mb_cavlc(H264Context *h){ |
| 1168 | 4569 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
|
4570 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1169 | 4571 int mb_type, partition_count, cbp; |
| 2755 | 4572 int dct8x8_allowed= h->pps.transform_8x8_mode; |
| 1168 | 4573 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4574 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong? |
| 1168 | 4575 |
| 1170 | 4576 tprintf("pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y); |
| 1453 | 4577 cbp = 0; /* avoid warning. FIXME: find a solution without slowing |
| 4578 down the code */ | |
| 1168 | 4579 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){ |
| 4580 if(s->mb_skip_run==-1) | |
| 4581 s->mb_skip_run= get_ue_golomb(&s->gb); | |
| 4582 | |
| 4583 if (s->mb_skip_run--) { | |
| 2396 | 4584 decode_mb_skip(h); |
| 1168 | 4585 return 0; |
| 4586 } | |
| 4587 } | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4588 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
|
4589 if ( ((s->mb_y&1) == 0) || h->prev_mb_skipped) |
| 1168 | 4590 h->mb_field_decoding_flag = get_bits1(&s->gb); |
| 4591 }else | |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
4592 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME); |
| 1168 | 4593 |
|
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
|
4594 h->prev_mb_skipped= 0; |
| 1168 | 4595 |
| 4596 mb_type= get_ue_golomb(&s->gb); | |
| 4597 if(h->slice_type == B_TYPE){ | |
| 4598 if(mb_type < 23){ | |
| 4599 partition_count= b_mb_type_info[mb_type].partition_count; | |
| 4600 mb_type= b_mb_type_info[mb_type].type; | |
| 4601 }else{ | |
| 4602 mb_type -= 23; | |
| 4603 goto decode_intra_mb; | |
| 4604 } | |
| 4605 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){ | |
| 4606 if(mb_type < 5){ | |
| 4607 partition_count= p_mb_type_info[mb_type].partition_count; | |
| 4608 mb_type= p_mb_type_info[mb_type].type; | |
| 4609 }else{ | |
| 4610 mb_type -= 5; | |
| 4611 goto decode_intra_mb; | |
| 4612 } | |
| 4613 }else{ | |
| 4614 assert(h->slice_type == I_TYPE); | |
| 4615 decode_intra_mb: | |
| 4616 if(mb_type > 25){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4617 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 | 4618 return -1; |
| 4619 } | |
| 4620 partition_count=0; | |
| 4621 cbp= i_mb_type_info[mb_type].cbp; | |
| 4622 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; | |
| 4623 mb_type= i_mb_type_info[mb_type].type; | |
| 4624 } | |
| 4625 | |
| 4626 if(h->mb_field_decoding_flag) | |
| 4627 mb_type |= MB_TYPE_INTERLACED; | |
| 4628 | |
| 4629 h->slice_table[ mb_xy ]= h->slice_num; | |
| 4630 | |
| 4631 if(IS_INTRA_PCM(mb_type)){ | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4632 unsigned int x, y; |
| 1168 | 4633 |
| 4634 // we assume these blocks are very rare so we dont optimize it | |
| 4635 align_get_bits(&s->gb); | |
| 4636 | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4637 // The pixels are stored in the same order as levels in h->mb array. |
| 1168 | 4638 for(y=0; y<16; y++){ |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4639 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3); |
| 1168 | 4640 for(x=0; x<16; x++){ |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4641 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
|
4642 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= get_bits(&s->gb, 8); |
| 1168 | 4643 } |
| 4644 } | |
| 4645 for(y=0; y<8; y++){ | |
| 4646 const int index= 256 + 4*(y&3) + 32*(y>>2); | |
| 4647 for(x=0; x<8; x++){ | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4648 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
|
4649 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
| 1168 | 4650 } |
| 4651 } | |
| 4652 for(y=0; y<8; y++){ | |
| 4653 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2); | |
| 4654 for(x=0; x<8; x++){ | |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4655 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
|
4656 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8); |
| 1168 | 4657 } |
| 4658 } | |
| 4659 | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4660 // In deblocking, the quantizer is 0 |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
4661 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
|
4662 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
|
4663 // 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
|
4664 memset(h->non_zero_count[mb_xy], 16, 16); |
| 1168 | 4665 |
| 2755 | 4666 s->current_picture.mb_type[mb_xy]= mb_type; |
| 1168 | 4667 return 0; |
| 4668 } | |
| 4669 | |
| 2449 | 4670 fill_caches(h, mb_type, 0); |
| 1168 | 4671 |
| 4672 //mb_pred | |
| 4673 if(IS_INTRA(mb_type)){ | |
| 4674 // init_top_left_availability(h); | |
| 4675 if(IS_INTRA4x4(mb_type)){ | |
| 4676 int i; | |
| 2755 | 4677 int di = 1; |
| 4678 if(dct8x8_allowed && get_bits1(&s->gb)){ | |
| 4679 mb_type |= MB_TYPE_8x8DCT; | |
| 4680 di = 4; | |
| 4681 } | |
| 1168 | 4682 |
| 4683 // fill_intra4x4_pred_table(h); | |
| 2755 | 4684 for(i=0; i<16; i+=di){ |
| 1168 | 4685 const int mode_coded= !get_bits1(&s->gb); |
| 4686 const int predicted_mode= pred_intra_mode(h, i); | |
| 4687 int mode; | |
| 4688 | |
| 4689 if(mode_coded){ | |
| 4690 const int rem_mode= get_bits(&s->gb, 3); | |
| 4691 if(rem_mode<predicted_mode) | |
| 4692 mode= rem_mode; | |
| 4693 else | |
| 4694 mode= rem_mode + 1; | |
| 4695 }else{ | |
| 4696 mode= predicted_mode; | |
| 4697 } | |
| 4698 | |
| 2755 | 4699 if(di==4) |
| 4700 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 ); | |
| 4701 else | |
| 4702 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode; | |
| 1168 | 4703 } |
| 4704 write_back_intra_pred_mode(h); | |
| 4705 if( check_intra4x4_pred_mode(h) < 0) | |
| 4706 return -1; | |
| 4707 }else{ | |
| 4708 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode); | |
| 4709 if(h->intra16x16_pred_mode < 0) | |
| 4710 return -1; | |
| 4711 } | |
| 4712 h->chroma_pred_mode= get_ue_golomb(&s->gb); | |
| 4713 | |
| 4714 h->chroma_pred_mode= check_intra_pred_mode(h, h->chroma_pred_mode); | |
| 4715 if(h->chroma_pred_mode < 0) | |
| 4716 return -1; | |
| 4717 }else if(partition_count==4){ | |
| 4718 int i, j, sub_partition_count[4], list, ref[2][4]; | |
| 4719 | |
| 4720 if(h->slice_type == B_TYPE){ | |
| 4721 for(i=0; i<4; i++){ | |
| 4722 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
| 4723 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
|
4724 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 | 4725 return -1; |
| 4726 } | |
| 4727 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
| 4728 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
| 4729 } | |
| 2396 | 4730 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1]) |
| 4731 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) | |
| 4732 pred_direct_motion(h, &mb_type); | |
| 1168 | 4733 }else{ |
| 4734 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ? | |
| 4735 for(i=0; i<4; i++){ | |
| 4736 h->sub_mb_type[i]= get_ue_golomb(&s->gb); | |
| 4737 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
|
4738 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 | 4739 return -1; |
| 4740 } | |
| 4741 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count; | |
| 4742 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type; | |
| 4743 } | |
| 4744 } | |
| 4745 | |
| 4746 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
|
4747 int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; |
| 1168 | 4748 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
|
4749 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
|
4750 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
|
4751 } |
| 1168 | 4752 for(i=0; i<4; i++){ |
| 2396 | 4753 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
| 4754 if(IS_DIR(h->sub_mb_type[i], 0, list)){ | |
| 1168 | 4755 ref[list][i] = get_te0_golomb(&s->gb, ref_count); //FIXME init to 0 before and skip? |
| 4756 }else{ | |
| 4757 //FIXME | |
| 4758 ref[list][i] = -1; | |
| 4759 } | |
| 4760 } | |
| 4761 } | |
| 4762 | |
| 2755 | 4763 if(dct8x8_allowed) |
| 4764 dct8x8_allowed = get_dct8x8_allowed(h); | |
| 4765 | |
| 1168 | 4766 for(list=0; list<2; list++){ |
| 4767 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list]; | |
| 4768 if(ref_count == 0) continue; | |
| 4769 | |
| 4770 for(i=0; i<4; i++){ | |
| 2396 | 4771 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
| 1168 | 4772 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]= |
| 4773 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i]; | |
| 4774 | |
| 2396 | 4775 if(IS_DIR(h->sub_mb_type[i], 0, list)){ |
| 1168 | 4776 const int sub_mb_type= h->sub_mb_type[i]; |
| 4777 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1; | |
| 4778 for(j=0; j<sub_partition_count[i]; j++){ | |
| 4779 int mx, my; | |
| 4780 const int index= 4*i + block_width*j; | |
| 4781 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ]; | |
| 4782 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my); | |
| 4783 mx += get_se_golomb(&s->gb); | |
| 4784 my += get_se_golomb(&s->gb); | |
| 1170 | 4785 tprintf("final mv:%d %d\n", mx, my); |
| 4786 | |
| 1168 | 4787 if(IS_SUB_8X8(sub_mb_type)){ |
| 4788 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= | |
| 4789 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx; | |
| 4790 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= | |
| 4791 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my; | |
| 4792 }else if(IS_SUB_8X4(sub_mb_type)){ | |
| 4793 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx; | |
| 4794 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my; | |
| 4795 }else if(IS_SUB_4X8(sub_mb_type)){ | |
| 4796 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx; | |
| 4797 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my; | |
| 4798 }else{ | |
| 4799 assert(IS_SUB_4X4(sub_mb_type)); | |
| 4800 mv_cache[ 0 ][0]= mx; | |
| 4801 mv_cache[ 0 ][1]= my; | |
| 4802 } | |
| 4803 } | |
| 4804 }else{ | |
| 4805 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0]; | |
| 4806 p[0] = p[1]= | |
| 4807 p[8] = p[9]= 0; | |
| 4808 } | |
| 4809 } | |
| 4810 } | |
| 2396 | 4811 }else if(IS_DIRECT(mb_type)){ |
| 4812 pred_direct_motion(h, &mb_type); | |
| 2755 | 4813 dct8x8_allowed &= h->sps.direct_8x8_inference_flag; |
| 2396 | 4814 }else{ |
| 1168 | 4815 int list, mx, my, i; |
| 4816 //FIXME we should set ref_idx_l? to 0 if we use that later ... | |
| 4817 if(IS_16X16(mb_type)){ | |
| 4818 for(list=0; list<2; list++){ | |
| 2392 | 4819 if(h->ref_count[list]>0){ |
| 1168 | 4820 if(IS_DIR(mb_type, 0, list)){ |
| 4821 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
| 4822 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | |
| 2523 | 4823 }else |
| 4824 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (LIST_NOT_USED&0xFF), 1); | |
| 1168 | 4825 } |
| 4826 } | |
| 4827 for(list=0; list<2; list++){ | |
| 4828 if(IS_DIR(mb_type, 0, list)){ | |
| 4829 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); | |
| 4830 mx += get_se_golomb(&s->gb); | |
| 4831 my += get_se_golomb(&s->gb); | |
| 1170 | 4832 tprintf("final mv:%d %d\n", mx, my); |
| 4833 | |
| 1269 | 4834 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
| 2523 | 4835 }else |
| 4836 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4); | |
| 1168 | 4837 } |
| 4838 } | |
| 4839 else if(IS_16X8(mb_type)){ | |
| 4840 for(list=0; list<2; list++){ | |
| 4841 if(h->ref_count[list]>0){ | |
| 4842 for(i=0; i<2; i++){ | |
| 4843 if(IS_DIR(mb_type, i, list)){ | |
| 4844 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
| 4845 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1); | |
| 2523 | 4846 }else |
| 2396 | 4847 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, (LIST_NOT_USED&0xFF), 1); |
| 1168 | 4848 } |
| 4849 } | |
| 4850 } | |
| 4851 for(list=0; list<2; list++){ | |
| 4852 for(i=0; i<2; i++){ | |
| 4853 if(IS_DIR(mb_type, i, list)){ | |
| 4854 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my); | |
| 4855 mx += get_se_golomb(&s->gb); | |
| 4856 my += get_se_golomb(&s->gb); | |
| 1170 | 4857 tprintf("final mv:%d %d\n", mx, my); |
| 4858 | |
| 1269 | 4859 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
| 2396 | 4860 }else |
| 4861 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); | |
| 1168 | 4862 } |
| 4863 } | |
| 4864 }else{ | |
| 4865 assert(IS_8X16(mb_type)); | |
| 4866 for(list=0; list<2; list++){ | |
| 4867 if(h->ref_count[list]>0){ | |
| 4868 for(i=0; i<2; i++){ | |
| 4869 if(IS_DIR(mb_type, i, list)){ //FIXME optimize | |
| 4870 const int val= get_te0_golomb(&s->gb, h->ref_count[list]); | |
| 4871 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1); | |
| 2523 | 4872 }else |
| 2396 | 4873 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, (LIST_NOT_USED&0xFF), 1); |
| 1168 | 4874 } |
| 4875 } | |
| 4876 } | |
| 4877 for(list=0; list<2; list++){ | |
| 4878 for(i=0; i<2; i++){ | |
| 4879 if(IS_DIR(mb_type, i, list)){ | |
| 4880 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my); | |
| 4881 mx += get_se_golomb(&s->gb); | |
| 4882 my += get_se_golomb(&s->gb); | |
| 1170 | 4883 tprintf("final mv:%d %d\n", mx, my); |
| 4884 | |
| 1269 | 4885 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
| 2396 | 4886 }else |
| 4887 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); | |
| 1168 | 4888 } |
| 4889 } | |
| 4890 } | |
| 4891 } | |
| 4892 | |
| 4893 if(IS_INTER(mb_type)) | |
| 4894 write_back_motion(h, mb_type); | |
| 4895 | |
| 4896 if(!IS_INTRA16x16(mb_type)){ | |
| 4897 cbp= get_ue_golomb(&s->gb); | |
| 4898 if(cbp > 47){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4899 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%d) at %d %d\n", cbp, s->mb_x, s->mb_y); |
| 1168 | 4900 return -1; |
| 4901 } | |
| 4902 | |
| 4903 if(IS_INTRA4x4(mb_type)) | |
| 4904 cbp= golomb_to_intra4x4_cbp[cbp]; | |
| 4905 else | |
| 4906 cbp= golomb_to_inter_cbp[cbp]; | |
| 4907 } | |
| 4908 | |
| 2755 | 4909 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){ |
| 4910 if(get_bits1(&s->gb)) | |
| 4911 mb_type |= MB_TYPE_8x8DCT; | |
| 4912 } | |
| 4913 s->current_picture.mb_type[mb_xy]= mb_type; | |
| 4914 | |
| 1168 | 4915 if(cbp || IS_INTRA16x16(mb_type)){ |
| 4916 int i8x8, i4x4, chroma_idx; | |
| 4917 int chroma_qp, dquant; | |
| 4918 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr; | |
| 4919 const uint8_t *scan, *dc_scan; | |
| 4920 | |
| 4921 // fill_non_zero_count_cache(h); | |
| 4922 | |
| 4923 if(IS_INTERLACED(mb_type)){ | |
|
2748
135aa7d0bd17
avoid one transpose (730->680 dezicycles on duron)
michael
parents:
2717
diff
changeset
|
4924 scan= h->field_scan; |
| 1168 | 4925 dc_scan= luma_dc_field_scan; |
| 4926 }else{ | |
|
2748
135aa7d0bd17
avoid one transpose (730->680 dezicycles on duron)
michael
parents:
2717
diff
changeset
|
4927 scan= h->zigzag_scan; |
| 1168 | 4928 dc_scan= luma_dc_zigzag_scan; |
| 4929 } | |
| 4930 | |
| 4931 dquant= get_se_golomb(&s->gb); | |
| 4932 | |
| 4933 if( dquant > 25 || dquant < -26 ){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
4934 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 | 4935 return -1; |
| 4936 } | |
| 4937 | |
| 4938 s->qscale += dquant; | |
| 4939 if(((unsigned)s->qscale) > 51){ | |
| 4940 if(s->qscale<0) s->qscale+= 52; | |
| 4941 else s->qscale-= 52; | |
| 4942 } | |
| 4943 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
4944 h->chroma_qp= chroma_qp= get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale); |
| 1168 | 4945 if(IS_INTRA16x16(mb_type)){ |
| 2755 | 4946 if( decode_residual(h, h->intra_gb_ptr, h->mb, LUMA_DC_BLOCK_INDEX, dc_scan, dequant_coeff[s->qscale], 16) < 0){ |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
4947 return -1; //FIXME continue if partitioned and other return -1 too |
| 1168 | 4948 } |
| 4949 | |
| 4950 assert((cbp&15) == 0 || (cbp&15) == 15); | |
| 4951 | |
| 4952 if(cbp&15){ | |
| 4953 for(i8x8=0; i8x8<4; i8x8++){ | |
| 4954 for(i4x4=0; i4x4<4; i4x4++){ | |
| 4955 const int index= i4x4 + 4*i8x8; | |
| 2755 | 4956 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, dequant_coeff[s->qscale], 15) < 0 ){ |
| 1168 | 4957 return -1; |
| 4958 } | |
| 4959 } | |
| 4960 } | |
| 4961 }else{ | |
| 1636 | 4962 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1); |
| 1168 | 4963 } |
| 4964 }else{ | |
| 4965 for(i8x8=0; i8x8<4; i8x8++){ | |
| 4966 if(cbp & (1<<i8x8)){ | |
| 2755 | 4967 if(IS_8x8DCT(mb_type)){ |
| 4968 DCTELEM *buf = &h->mb[64*i8x8]; | |
| 2757 | 4969 uint8_t *nnz; |
| 2755 | 4970 for(i4x4=0; i4x4<4; i4x4++){ |
| 4971 if( decode_residual(h, gb, buf, i4x4+4*i8x8, zigzag_scan8x8_cavlc+16*i4x4, | |
| 4972 h->dequant8_coeff[s->qscale], 16) <0 ) | |
| 4973 return -1; | |
| 4974 } | |
| 4975 if(s->qscale < 12){ | |
| 4976 int i; | |
| 4977 for(i=0; i<64; i++) | |
| 4978 buf[i] = (buf[i] + 2) >> 2; | |
| 4979 } | |
| 2757 | 4980 nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; |
| 2755 | 4981 nnz[0] |= nnz[1] | nnz[8] | nnz[9]; |
| 4982 }else{ | |
| 4983 for(i4x4=0; i4x4<4; i4x4++){ | |
| 4984 const int index= i4x4 + 4*i8x8; | |
| 1168 | 4985 |
| 2755 | 4986 if( decode_residual(h, gb, h->mb + 16*index, index, scan, dequant_coeff[s->qscale], 16) <0 ){ |
| 4987 return -1; | |
| 4988 } | |
| 1168 | 4989 } |
| 4990 } | |
| 4991 }else{ | |
| 4992 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ]; | |
| 4993 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0; | |
| 4994 } | |
| 4995 } | |
| 4996 } | |
| 4997 | |
| 4998 if(cbp&0x30){ | |
| 4999 for(chroma_idx=0; chroma_idx<2; chroma_idx++) | |
| 2755 | 5000 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, dequant_coeff[chroma_qp], 4) < 0){ |
| 1168 | 5001 return -1; |
| 5002 } | |
| 5003 } | |
| 5004 | |
| 5005 if(cbp&0x20){ | |
| 5006 for(chroma_idx=0; chroma_idx<2; chroma_idx++){ | |
| 5007 for(i4x4=0; i4x4<4; i4x4++){ | |
| 5008 const int index= 16 + 4*chroma_idx + i4x4; | |
| 2755 | 5009 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, dequant_coeff[chroma_qp], 15) < 0){ |
| 1168 | 5010 return -1; |
| 5011 } | |
| 5012 } | |
| 5013 } | |
| 5014 }else{ | |
| 5015 uint8_t * const nnz= &h->non_zero_count_cache[0]; | |
| 5016 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
| 5017 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; | |
| 5018 } | |
| 5019 }else{ | |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
5020 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
|
5021 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
|
5022 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
|
5023 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0; |
| 1168 | 5024 } |
|
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
|
5025 s->current_picture.qscale_table[mb_xy]= s->qscale; |
| 1168 | 5026 write_back_non_zero_count(h); |
| 5027 | |
| 5028 return 0; | |
| 5029 } | |
| 5030 | |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5031 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
|
5032 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
|
5033 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
|
5034 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
|
5035 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
|
5036 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
|
5037 |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5038 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
|
5039 |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5040 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
|
5041 ctx += 1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5042 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5043 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
|
5044 ctx += 1; |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5045 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5046 |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5047 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
|
5048 } |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5049 |
| 2312 | 5050 static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_slice) { |
| 5051 uint8_t *state= &h->cabac_state[ctx_base]; | |
| 5052 int mb_type; | |
| 5053 | |
| 5054 if(intra_slice){ | |
| 5055 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
|
5056 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
|
5057 const int mbb_xy = h->top_mb_xy; |
| 2312 | 5058 int ctx=0; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5059 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
|
5060 ctx++; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5061 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
|
5062 ctx++; |
| 2312 | 5063 if( get_cabac( &h->cabac, &state[ctx] ) == 0 ) |
| 5064 return 0; /* I4x4 */ | |
| 5065 state += 2; | |
| 5066 }else{ | |
| 5067 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
|
5068 return 0; /* I4x4 */ |
| 2312 | 5069 } |
| 5070 | |
| 5071 if( get_cabac_terminate( &h->cabac ) ) | |
| 5072 return 25; /* PCM */ | |
| 5073 | |
| 5074 mb_type = 1; /* I16x16 */ | |
| 5075 if( get_cabac( &h->cabac, &state[1] ) ) | |
| 5076 mb_type += 12; /* cbp_luma != 0 */ | |
| 5077 | |
| 5078 if( get_cabac( &h->cabac, &state[2] ) ) { | |
| 5079 if( get_cabac( &h->cabac, &state[2+intra_slice] ) ) | |
| 5080 mb_type += 4 * 2; /* cbp_chroma == 2 */ | |
| 5081 else | |
| 5082 mb_type += 4 * 1; /* cbp_chroma == 1 */ | |
| 5083 } | |
| 5084 if( get_cabac( &h->cabac, &state[3+intra_slice] ) ) | |
| 5085 mb_type += 2; | |
| 5086 if( get_cabac( &h->cabac, &state[3+2*intra_slice] ) ) | |
| 5087 mb_type += 1; | |
| 5088 return mb_type; | |
| 5089 } | |
| 5090 | |
| 5091 static int decode_cabac_mb_type( H264Context *h ) { | |
| 5092 MpegEncContext * const s = &h->s; | |
| 5093 | |
| 5094 if( h->slice_type == I_TYPE ) { | |
| 5095 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
|
5096 } 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
|
5097 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
|
5098 /* 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
|
5099 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
|
5100 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
|
5101 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
|
5102 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5103 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
|
5104 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5105 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
|
5106 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
|
5107 else |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5108 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
|
5109 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5110 } else { |
| 2312 | 5111 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
|
5112 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5113 } 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
|
5114 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
|
5115 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
|
5116 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
|
5117 int bits; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5118 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5119 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
|
5120 && !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
|
5121 ctx++; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5122 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
|
5123 && !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
|
5124 ctx++; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5125 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5126 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
|
5127 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
|
5128 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5129 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
|
5130 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
|
5131 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5132 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5133 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
|
5134 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
|
5135 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
|
5136 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
|
5137 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
|
5138 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
|
5139 else if( bits == 13 ) { |
| 2312 | 5140 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
|
5141 } 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
|
5142 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
|
5143 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
|
5144 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
|
5145 |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5146 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
|
5147 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
|
5148 } else { |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5149 /* 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
|
5150 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
|
5151 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5152 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5153 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5154 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
|
5155 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
|
5156 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
|
5157 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
|
5158 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
|
5159 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
|
5160 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5161 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
|
5162 ctx++; |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5163 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
|
5164 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5165 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5166 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
|
5167 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
|
5168 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
|
5169 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
|
5170 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5171 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5172 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
|
5173 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
|
5174 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5175 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
|
5176 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
|
5177 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5178 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
|
5179 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
|
5180 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
|
5181 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
|
5182 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
|
5183 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
|
5184 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
|
5185 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
|
5186 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5187 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
|
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_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
|
5191 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
|
5192 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
|
5193 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5194 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
|
5195 |
|
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
|
5196 /* 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
|
5197 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
|
5198 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
|
5199 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5200 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
|
5201 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5202 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5203 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
|
5204 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
|
5205 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5206 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
|
5207 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
|
5208 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
|
5209 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
|
5210 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5211 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
|
5212 } |
|
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 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
|
5215 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
|
5216 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5217 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
|
5218 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
|
5219 }; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5220 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
|
5221 { 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
|
5222 { 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
|
5223 { 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
|
5224 { 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
|
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 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5227 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
|
5228 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
|
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 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
|
5231 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
|
5232 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5233 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
|
5234 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
|
5235 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
|
5236 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
|
5237 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
|
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 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
|
5240 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
|
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( 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
|
5243 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
|
5244 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
|
5245 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
|
5246 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
|
5247 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5248 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5249 if( 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
|
5250 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
|
5251 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
|
5252 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
|
5253 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
|
5254 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5255 |
|
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
|
5256 /* 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
|
5257 /* 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
|
5258 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
|
5259 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
|
5260 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
|
5261 ctx++; |
|
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 |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5264 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
|
5265 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
|
5266 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
|
5267 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
|
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 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5270 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
|
5271 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
|
5272 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5273 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5274 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
|
5275 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5276 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
|
5277 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
|
5278 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
|
5279 |
| 2314 | 5280 cbp_a = (h->left_cbp>>4)&0x03; |
| 5281 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
|
5282 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5283 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
|
5284 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
|
5285 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
|
5286 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
|
5287 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
|
5288 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5289 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
|
5290 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
|
5291 if( cbp_b == 2 ) ctx += 2; |
| 2314 | 5292 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
|
5293 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5294 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
|
5295 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
|
5296 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
|
5297 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
|
5298 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
|
5299 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5300 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
|
5301 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
|
5302 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5303 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
|
5304 |
|
2498
4d6d056a00c6
H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents:
2485
diff
changeset
|
5305 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
|
5306 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 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5308 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
|
5309 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
|
5310 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
|
5311 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5312 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
|
5313 val++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5314 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5315 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5316 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
|
5317 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
|
5318 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5319 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
|
5320 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5321 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
|
5322 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
|
5323 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
|
5324 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
|
5325 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
|
5326 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
|
5327 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
|
5328 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
|
5329 } |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5330 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
|
5331 int type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5332 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
|
5333 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
|
5334 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
|
5335 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
|
5336 type = 3; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5337 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
|
5338 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
|
5339 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
|
5340 type += 4; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5341 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5342 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
|
5343 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
|
5344 return type; |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5345 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5346 |
| 2755 | 5347 static inline int decode_cabac_mb_transform_size( H264Context *h ) { |
| 5348 return get_cabac( &h->cabac, &h->cabac_state[399 + h->neighbor_transform_size] ); | |
| 5349 } | |
| 5350 | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5351 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
|
5352 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
|
5353 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
|
5354 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
|
5355 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
|
5356 |
| 2396 | 5357 if( h->slice_type == B_TYPE) { |
| 5358 if( refa > 0 && !h->direct_cache[scan8[n] - 1] ) | |
| 5359 ctx++; | |
| 5360 if( refb > 0 && !h->direct_cache[scan8[n] - 8] ) | |
| 5361 ctx += 2; | |
| 5362 } else { | |
| 5363 if( refa > 0 ) | |
| 5364 ctx++; | |
| 5365 if( refb > 0 ) | |
| 5366 ctx += 2; | |
| 5367 } | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5368 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5369 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
|
5370 ref++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5371 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
|
5372 ctx = 4; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5373 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5374 ctx = 5; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5375 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5376 return ref; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5377 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5378 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5379 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
|
5380 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
|
5381 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
|
5382 int ctxbase = (l == 0) ? 40 : 47; |
| 2317 | 5383 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
|
5384 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5385 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
|
5386 ctx = 0; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5387 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
|
5388 ctx = 2; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5389 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5390 ctx = 1; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5391 |
| 2317 | 5392 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx])) |
| 5393 return 0; | |
| 5394 | |
| 5395 mvd= 1; | |
| 5396 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
|
5397 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
|
5398 mvd++; |
| 2317 | 5399 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
|
5400 ctx++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5401 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5402 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5403 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
|
5404 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
|
5405 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
|
5406 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
|
5407 k++; |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5408 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5409 while( k-- ) { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5410 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
|
5411 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
|
5412 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5413 } |
| 2317 | 5414 if( get_cabac_bypass( &h->cabac ) ) return -mvd; |
| 5415 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
|
5416 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5417 |
| 2316 | 5418 static int inline get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) { |
| 2314 | 5419 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
|
5420 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
|
5421 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5422 if( cat == 0 ) { |
| 2314 | 5423 nza = h->left_cbp&0x100; |
| 5424 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
|
5425 } else if( cat == 1 || cat == 2 ) { |
| 2314 | 5426 nza = h->non_zero_count_cache[scan8[idx] - 1]; |
| 5427 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
|
5428 } else if( cat == 3 ) { |
| 2314 | 5429 nza = (h->left_cbp>>(6+idx))&0x01; |
| 5430 nzb = (h-> top_cbp>>(6+idx))&0x01; | |
| 5431 } else { | |
| 5432 assert(cat == 4); | |
| 5433 nza = h->non_zero_count_cache[scan8[16+idx] - 1]; | |
| 5434 nzb = h->non_zero_count_cache[scan8[16+idx] - 8]; | |
| 5435 } | |
| 5436 | |
| 5437 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
|
5438 ctx++; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5439 |
| 2314 | 5440 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
|
5441 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
|
5442 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5443 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
|
5444 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5445 |
| 2755 | 5446 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
|
5447 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
|
5448 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
|
5449 static const int last_significant_coeff_flag_field_offset[2] = { 166, 338 }; |
| 2755 | 5450 static const int significant_coeff_flag_offset[6] = { 0, 15, 29, 44, 47, 297 }; |
| 5451 static const int last_significant_coeff_flag_offset[6] = { 0, 15, 29, 44, 47, 251 }; | |
| 5452 static const int coeff_abs_level_m1_offset[6] = { 227+0, 227+10, 227+20, 227+30, 227+39, 426 }; | |
| 5453 static const int identity[15] = { | |
| 5454 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 | |
| 5455 }; | |
| 5456 static const int significant_coeff_flag_offset_8x8[63] = { | |
| 5457 0, 1, 2, 3, 4, 5, 5, 4, 4, 3, 3, 4, 4, 4, 5, 5, | |
| 5458 4, 4, 4, 4, 3, 3, 6, 7, 7, 7, 8, 9,10, 9, 8, 7, | |
| 5459 7, 6,11,12,13,11, 6, 7, 8, 9,14,10, 9, 8, 6,11, | |
| 5460 12,13,11, 6, 9,14,10, 9,11,12,13,11,14,10,12 | |
| 5461 }; | |
| 5462 static const int last_coeff_flag_offset_8x8[63] = { | |
| 5463 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | |
| 5464 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | |
| 5465 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, | |
| 5466 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8 | |
| 5467 }; | |
| 5468 | |
| 5469 int index[64]; | |
| 2313 | 5470 |
| 5471 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
|
5472 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
|
5473 |
| 2316 | 5474 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
|
5475 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
|
5476 |
| 2755 | 5477 const int* significant_coeff_ctx_offset; |
| 5478 const int* last_coeff_ctx_offset; | |
| 5479 const int significant_coeff_ctx_base = significant_coeff_flag_offset[cat] | |
| 5480 + significant_coeff_flag_field_offset[h->mb_field_decoding_flag]; | |
| 5481 const int last_coeff_ctx_base = last_significant_coeff_flag_offset[cat] | |
| 5482 + last_significant_coeff_flag_field_offset[h->mb_field_decoding_flag]; | |
| 5483 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5484 /* 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
|
5485 * 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
|
5486 * 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
|
5487 * 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
|
5488 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx |
| 2755 | 5489 * 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
|
5490 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5491 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5492 /* read coded block flag */ |
| 2755 | 5493 if( cat == 5 ) { |
| 5494 significant_coeff_ctx_offset = significant_coeff_flag_offset_8x8; | |
| 5495 last_coeff_ctx_offset = last_coeff_flag_offset_8x8; | |
| 5496 } else { | |
| 5497 if( get_cabac( &h->cabac, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n ) ] ) == 0 ) { | |
| 5498 if( cat == 1 || cat == 2 ) | |
| 5499 h->non_zero_count_cache[scan8[n]] = 0; | |
| 5500 else if( cat == 4 ) | |
| 5501 h->non_zero_count_cache[scan8[16+n]] = 0; | |
| 5502 | |
| 5503 return 0; | |
| 5504 } | |
| 5505 | |
| 5506 significant_coeff_ctx_offset = | |
| 5507 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
|
5508 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5509 |
| 2313 | 5510 for(last= 0; last < max_coeff - 1; last++) { |
| 2755 | 5511 int sig_ctx = significant_coeff_ctx_base + significant_coeff_ctx_offset[last]; |
| 5512 if( get_cabac( &h->cabac, &h->cabac_state[sig_ctx] )) { | |
| 5513 int last_ctx = last_coeff_ctx_base + last_coeff_ctx_offset[last]; | |
| 2313 | 5514 index[coeff_count++] = last; |
| 2755 | 5515 if( get_cabac( &h->cabac, &h->cabac_state[last_ctx] ) ) { |
| 2313 | 5516 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
|
5517 break; |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5518 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5519 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5520 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5521 if( last == max_coeff -1 ) { |
| 2313 | 5522 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
|
5523 } |
| 2316 | 5524 assert(coeff_count > 0); |
| 5525 | |
| 5526 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
|
5527 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
|
5528 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
|
5529 h->non_zero_count_cache[scan8[n]] = coeff_count; |
| 2316 | 5530 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
|
5531 h->cbp_table[mb_xy] |= 0x40 << n; |
| 2755 | 5532 else if( cat == 4 ) |
| 5533 h->non_zero_count_cache[scan8[16+n]] = coeff_count; | |
| 2316 | 5534 else { |
| 2755 | 5535 assert( cat == 5 ); |
| 5536 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, 1, 1); | |
| 2316 | 5537 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5538 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5539 for( i = coeff_count - 1; i >= 0; i-- ) { |
| 2316 | 5540 int ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + coeff_abs_level_m1_offset[cat]; |
| 5541 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
|
5542 |
| 2313 | 5543 if( get_cabac( &h->cabac, &h->cabac_state[ctx] ) == 0 ) { |
| 2316 | 5544 if( cat == 0 || cat == 3 ) { |
| 5545 if( get_cabac_bypass( &h->cabac ) ) block[j] = -1; | |
| 5546 else block[j] = 1; | |
| 5547 }else{ | |
| 5548 if( get_cabac_bypass( &h->cabac ) ) block[j] = -qmul[j]; | |
| 5549 else block[j] = qmul[j]; | |
| 5550 } | |
| 2313 | 5551 |
| 5552 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
|
5553 } else { |
| 2313 | 5554 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
|
5555 ctx = 5 + FFMIN( 4, abslevelgt1 ) + coeff_abs_level_m1_offset[cat]; |
| 2313 | 5556 while( coeff_abs < 15 && get_cabac( &h->cabac, &h->cabac_state[ctx] ) ) { |
| 5557 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
|
5558 } |
| 2313 | 5559 |
| 5560 if( coeff_abs >= 15 ) { | |
| 5561 int j = 0; | |
| 5562 while( get_cabac_bypass( &h->cabac ) ) { | |
| 5563 coeff_abs += 1 << j; | |
| 5564 j++; | |
| 5565 } | |
| 5566 | |
| 5567 while( j-- ) { | |
| 5568 if( get_cabac_bypass( &h->cabac ) ) | |
| 5569 coeff_abs += 1 << j ; | |
| 5570 } | |
| 5571 } | |
| 5572 | |
| 2316 | 5573 if( cat == 0 || cat == 3 ) { |
| 5574 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs; | |
| 5575 else block[j] = coeff_abs; | |
| 5576 }else{ | |
| 5577 if( get_cabac_bypass( &h->cabac ) ) block[j] = -coeff_abs * qmul[j]; | |
| 5578 else block[j] = coeff_abs * qmul[j]; | |
| 5579 } | |
| 2313 | 5580 |
| 5581 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
|
5582 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5583 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5584 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
|
5585 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5586 |
|
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5587 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
|
5588 { |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5589 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
|
5590 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
|
5591 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
|
5592 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
|
5593 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
|
5594 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
|
5595 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
|
5596 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
|
5597 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
|
5598 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
|
5599 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
|
5600 if (bottom |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5601 ? !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
|
5602 : (!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
|
5603 ) { |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5604 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
|
5605 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5606 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
|
5607 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
|
5608 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5609 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5610 return; |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5611 } |
|
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5612 |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5613 /** |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5614 * 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
|
5615 * @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
|
5616 */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5617 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
|
5618 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
|
5619 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
|
5620 int mb_type, partition_count, cbp = 0; |
| 2755 | 5621 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
|
5622 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5623 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
|
5624 |
|
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
|
5625 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
|
5626 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
|
5627 /* 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
|
5628 if( decode_cabac_mb_skip( h ) ) { |
| 2396 | 5629 decode_mb_skip(h); |
| 5630 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5631 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
|
5632 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
|
5633 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
|
5634 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5635 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
|
5636 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5637 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5638 } |
|
2594
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5639 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
|
5640 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
|
5641 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
|
5642 }else |
|
5357b214eda0
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer | lll+ffmpeg m4x org)
michael
parents:
2583
diff
changeset
|
5643 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
|
5644 |
|
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
|
5645 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
|
5646 |
|
2597
b5b09255f7c3
CABAC support for MBAFF I frames patch by (Lo?c Le Loarer < lll+ffmpeg m4x org)
michael
parents:
2594
diff
changeset
|
5647 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
|
5648 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
|
5649 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
|
5650 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
|
5651 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5652 |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5653 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
|
5654 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
|
5655 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
|
5656 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
|
5657 }else{ |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5658 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
|
5659 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
|
5660 } |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5661 } 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
|
5662 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
|
5663 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
|
5664 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
|
5665 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5666 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
|
5667 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
|
5668 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5669 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5670 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
|
5671 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
|
5672 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
|
5673 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
|
5674 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
|
5675 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
|
5676 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5677 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
|
5678 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
|
5679 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5680 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
|
5681 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5682 if(IS_INTRA_PCM(mb_type)) { |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5683 const uint8_t *ptr; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5684 unsigned int x, y; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5685 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5686 // 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
|
5687 // 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
|
5688 // 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
|
5689 ptr= h->cabac.bytestream; |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5690 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
|
5691 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5692 // 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
|
5693 for(y=0; y<16; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5694 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
|
5695 for(x=0; x<16; x++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5696 tprintf("LUMA ICPM LEVEL (%3d)\n", *ptr); |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5697 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
|
5698 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5699 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5700 for(y=0; y<8; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5701 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
|
5702 for(x=0; x<8; x++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5703 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
|
5704 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
|
5705 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5706 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5707 for(y=0; y<8; y++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5708 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
|
5709 for(x=0; x<8; x++){ |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5710 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
|
5711 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
|
5712 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5713 } |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5714 |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5715 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
|
5716 |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
5717 // All blocks are present |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5718 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
|
5719 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
|
5720 // In deblocking, the quantizer is 0 |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5721 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
|
5722 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
|
5723 // All coeffs are present |
|
2504
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
5724 memset(h->non_zero_count[mb_xy], 16, 16); |
| 2755 | 5725 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
|
5726 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
|
5727 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5728 |
| 2449 | 5729 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
|
5730 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5731 if( IS_INTRA( mb_type ) ) { |
| 2755 | 5732 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
|
5733 if( IS_INTRA4x4( mb_type ) ) { |
| 2755 | 5734 if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) { |
| 5735 mb_type |= MB_TYPE_8x8DCT; | |
| 5736 for( i = 0; i < 16; i+=4 ) { | |
| 5737 int pred = pred_intra_mode( h, i ); | |
| 5738 int mode = decode_cabac_mb_intra4x4_pred_mode( h, pred ); | |
| 5739 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 ); | |
| 5740 } | |
| 5741 } else { | |
| 5742 for( i = 0; i < 16; i++ ) { | |
| 5743 int pred = pred_intra_mode( h, i ); | |
| 5744 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
|
5745 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5746 //av_log( s->avctx, AV_LOG_ERROR, "i4x4 pred=%d mode=%d\n", pred, h->intra4x4_pred_mode_cache[ scan8[i] ] ); |
| 2755 | 5747 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5748 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5749 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
|
5750 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
|
5751 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5752 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
|
5753 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
|
5754 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5755 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
|
5756 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
|
5757 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5758 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
|
5759 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
|
5760 } 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
|
5761 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
|
5762 |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5763 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
|
5764 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
|
5765 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
|
5766 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
|
5767 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
|
5768 } |
| 2396 | 5769 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1]) |
| 5770 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) { | |
| 5771 pred_direct_motion(h, &mb_type); | |
| 5772 if( h->ref_count[0] > 1 || h->ref_count[1] > 1 ) { | |
| 5773 for( i = 0; i < 4; i++ ) | |
| 5774 if( IS_DIRECT(h->sub_mb_type[i]) ) | |
| 5775 fill_rectangle( &h->direct_cache[scan8[4*i]], 2, 2, 8, 1, 1 ); | |
| 5776 } | |
| 5777 } | |
|
2310
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5778 } else { |
|
c5cd8a064c34
H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents:
2284
diff
changeset
|
5779 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
|
5780 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
|
5781 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
|
5782 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
|
5783 } |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5784 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5785 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5786 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
|
5787 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
|
5788 for( i = 0; i < 4; i++ ) { |
| 2396 | 5789 if(IS_DIRECT(h->sub_mb_type[i])) continue; |
| 5790 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
|
5791 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
|
5792 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
|
5793 else |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5794 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
|
5795 } else { |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5796 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
|
5797 } |
| 2110 | 5798 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
|
5799 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
|
5800 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5801 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5802 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5803 |
| 2755 | 5804 if(dct8x8_allowed) |
| 5805 dct8x8_allowed = get_dct8x8_allowed(h); | |
| 5806 | |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5807 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
|
5808 for(i=0; i<4; i++){ |
| 2396 | 5809 if(IS_DIRECT(h->sub_mb_type[i])){ |
| 5810 fill_rectangle(h->mvd_cache[list][scan8[4*i]], 2, 2, 8, 0, 4); | |
| 5811 continue; | |
| 5812 } | |
| 2110 | 5813 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
|
5814 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5815 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
|
5816 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
|
5817 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
|
5818 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
|
5819 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
|
5820 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
|
5821 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
|
5822 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
|
5823 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
|
5824 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
|
5825 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5826 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
|
5827 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
|
5828 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
|
5829 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5830 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
|
5831 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
|
5832 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
|
5833 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
|
5834 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
|
5835 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5836 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
|
5837 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
|
5838 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
|
5839 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
|
5840 }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
|
5841 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
|
5842 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
|
5843 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5844 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
|
5845 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
|
5846 }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
|
5847 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
|
5848 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
|
5849 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5850 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
|
5851 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
|
5852 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5853 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
|
5854 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
|
5855 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
|
5856 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5857 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
|
5858 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
|
5859 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5860 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5861 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5862 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
|
5863 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
|
5864 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
|
5865 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
|
5866 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5867 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5868 } |
| 2396 | 5869 } else if( IS_DIRECT(mb_type) ) { |
| 5870 pred_direct_motion(h, &mb_type); | |
| 5871 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4); | |
| 5872 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4); | |
| 2755 | 5873 dct8x8_allowed &= h->sps.direct_8x8_inference_flag; |
| 2396 | 5874 } else { |
|
1935
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5875 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
|
5876 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
|
5877 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
|
5878 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
|
5879 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
|
5880 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
|
5881 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
|
5882 } |
| 2523 | 5883 }else |
| 5884 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
|
5885 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5886 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
|
5887 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
|
5888 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
|
5889 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5890 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
|
5891 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
|
5892 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
|
5893 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5894 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
|
5895 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
| 2523 | 5896 }else |
| 5897 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
|
5898 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5899 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5900 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
|
5901 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
|
5902 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
|
5903 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
|
5904 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
|
5905 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
|
5906 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, ref, 1); |
| 2396 | 5907 }else |
| 5908 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
|
5909 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5910 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5911 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5912 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
|
5913 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
|
5914 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
|
5915 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
|
5916 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
|
5917 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
|
5918 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
|
5919 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5920 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
|
5921 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4); |
| 2523 | 5922 }else{ |
| 2396 | 5923 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4); |
| 5924 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
|
5925 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5926 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5927 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5928 }else{ |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5929 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
|
5930 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
|
5931 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
|
5932 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
|
5933 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
|
5934 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
|
5935 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, ref, 1); |
| 2396 | 5936 }else |
| 5937 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
|
5938 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5939 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5940 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5941 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
|
5942 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
|
5943 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
|
5944 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
|
5945 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
|
5946 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
|
5947 |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5948 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
|
5949 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
|
5950 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4); |
| 2523 | 5951 }else{ |
| 2396 | 5952 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4); |
| 5953 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
|
5954 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5955 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5956 } |
|
e935af90767b
progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1909
diff
changeset
|
5957 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5958 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5959 |
|
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
|
5960 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
|
5961 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
|
5962 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
|
5963 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5964 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5965 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
|
5966 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
|
5967 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
|
5968 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5969 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5970 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
|
5971 |
| 2755 | 5972 if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) { |
| 5973 if( decode_cabac_mb_transform_size( h ) ) | |
| 5974 mb_type |= MB_TYPE_8x8DCT; | |
| 5975 } | |
| 5976 s->current_picture.mb_type[mb_xy]= mb_type; | |
| 5977 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5978 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
|
5979 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
|
5980 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
|
5981 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5982 if(IS_INTERLACED(mb_type)){ |
|
2748
135aa7d0bd17
avoid one transpose (730->680 dezicycles on duron)
michael
parents:
2717
diff
changeset
|
5983 scan= h->field_scan; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5984 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
|
5985 }else{ |
|
2748
135aa7d0bd17
avoid one transpose (730->680 dezicycles on duron)
michael
parents:
2717
diff
changeset
|
5986 scan= h->zigzag_scan; |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5987 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
|
5988 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5989 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5990 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
|
5991 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
|
5992 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
|
5993 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
|
5994 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
|
5995 } |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
5996 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
|
5997 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
5998 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
|
5999 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
|
6000 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" ); |
| 2755 | 6001 if( decode_cabac_residual( h, h->mb, 0, 0, dc_scan, dequant_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
|
6002 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
|
6003 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
|
6004 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
|
6005 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i ); |
| 2755 | 6006 if( decode_cabac_residual(h, h->mb + 16*i, 1, i, scan + 1, dequant_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
|
6007 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
|
6008 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6009 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6010 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
|
6011 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6012 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6013 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
|
6014 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
|
6015 if( cbp & (1<<i8x8) ) { |
| 2755 | 6016 if( IS_8x8DCT(mb_type) ) { |
| 6017 if( decode_cabac_residual(h, h->mb + 64*i8x8, 5, 4*i8x8, | |
| 6018 zigzag_scan8x8, h->dequant8_coeff[s->qscale], 64) < 0 ) | |
| 6019 return -1; | |
| 6020 if(s->qscale < 12){ | |
| 6021 int i; | |
| 6022 for(i=0; i<64; i++) | |
| 6023 h->mb[64*i8x8+i] = (h->mb[64*i8x8+i] + 2) >> 2; | |
| 6024 } | |
| 6025 } 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
|
6026 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
|
6027 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
|
6028 //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index ); |
| 2755 | 6029 if( decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, dequant_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
|
6030 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
|
6031 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6032 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6033 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
|
6034 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
|
6035 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6036 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6037 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6038 |
|
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&0x30 ){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6040 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
|
6041 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
|
6042 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c ); |
| 2755 | 6043 if( decode_cabac_residual(h, h->mb + 256 + 16*4*c, 3, c, chroma_dc_scan, dequant_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
|
6044 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
|
6045 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6046 } |
|
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 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
|
6049 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
|
6050 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
|
6051 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
|
6052 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
|
6053 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 ); |
| 2755 | 6054 if( decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, dequant_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
|
6055 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
|
6056 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6057 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6058 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6059 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
|
6060 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
|
6061 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
|
6062 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6063 } else { |
| 2315 | 6064 uint8_t * const nnz= &h->non_zero_count_cache[0]; |
| 6065 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1); | |
| 6066 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] = | |
| 6067 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
|
6068 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6069 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6070 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
|
6071 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
|
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 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
|
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 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6076 |
|
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
|
6077 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
|
6078 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
|
6079 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
|
6080 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
|
6081 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
|
6082 |
| 2633 | 6083 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
|
6084 int8_t tc[4]; |
| 2633 | 6085 for(i=0; i<4; i++) |
| 6086 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] : -1; | |
| 6087 h->s.dsp.h264_h_loop_filter_luma(pix, stride, alpha, beta, tc); | |
| 6088 } else { | |
| 6089 /* 16px edge length, because bS=4 is triggered by being at | |
| 6090 * the edge of an intra MB, so all 4 bS are the same */ | |
| 6091 for( d = 0; d < 16; d++ ) { | |
| 1898 | 6092 const int p0 = pix[-1]; |
| 6093 const int p1 = pix[-2]; | |
| 6094 const int p2 = pix[-3]; | |
| 6095 | |
| 6096 const int q0 = pix[0]; | |
| 6097 const int q1 = pix[1]; | |
| 6098 const int q2 = pix[2]; | |
| 6099 | |
| 6100 if( ABS( p0 - q0 ) < alpha && | |
| 6101 ABS( p1 - p0 ) < beta && | |
| 6102 ABS( q1 - q0 ) < beta ) { | |
| 6103 | |
| 6104 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
| 6105 if( ABS( p2 - p0 ) < beta) | |
| 6106 { | |
| 6107 const int p3 = pix[-4]; | |
| 6108 /* p0', p1', p2' */ | |
| 6109 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
| 6110 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
| 6111 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
| 6112 } else { | |
| 6113 /* p0' */ | |
| 6114 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6115 } | |
| 6116 if( ABS( q2 - q0 ) < beta) | |
| 6117 { | |
| 6118 const int q3 = pix[3]; | |
| 6119 /* q0', q1', q2' */ | |
| 6120 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
| 6121 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
| 6122 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
| 6123 } else { | |
| 6124 /* q0' */ | |
| 6125 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6126 } | |
| 6127 }else{ | |
| 6128 /* p0', q0' */ | |
| 6129 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6130 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6131 } | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6132 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
|
6133 } |
| 1898 | 6134 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
|
6135 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6136 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6137 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6138 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
|
6139 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
|
6140 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
|
6141 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
|
6142 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
|
6143 |
| 2633 | 6144 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
|
6145 int8_t tc[4]; |
| 2633 | 6146 for(i=0; i<4; i++) |
| 6147 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] + 1 : 0; | |
| 6148 h->s.dsp.h264_h_loop_filter_chroma(pix, stride, alpha, beta, tc); | |
| 6149 } else { | |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6150 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
|
6151 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6152 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6153 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6154 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
|
6155 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6156 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
|
6157 int index_a; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6158 int alpha; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6159 int beta; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6160 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6161 int qp_index; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6162 int bS_index = (i >> 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6163 if (h->mb_field_decoding_flag) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6164 bS_index &= ~1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6165 bS_index |= (i & 1); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6166 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6167 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6168 if( bS[bS_index] == 0 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6169 continue; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6170 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6171 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6172 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
|
6173 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
|
6174 alpha = alpha_table[index_a]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6175 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
|
6176 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6177 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6178 if( bS[bS_index] < 4 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6179 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
|
6180 /* 4px edge length */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6181 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6182 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6183 const int p2 = pix[-3]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6184 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6185 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6186 const int q2 = pix[2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6187 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6188 if( ABS( p0 - q0 ) < alpha && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6189 ABS( p1 - p0 ) < beta && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6190 ABS( q1 - q0 ) < beta ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6191 int tc = tc0; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6192 int i_delta; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6193 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6194 if( ABS( p2 - p0 ) < beta ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6195 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
|
6196 tc++; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6197 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6198 if( ABS( q2 - q0 ) < beta ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6199 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
|
6200 tc++; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6201 } |
|
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 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
|
6204 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
|
6205 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
|
6206 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
|
6207 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6208 }else{ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6209 /* 4px edge length */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6210 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6211 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6212 const int p2 = pix[-3]; |
|
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 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6215 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6216 const int q2 = pix[2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6217 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6218 if( ABS( p0 - q0 ) < alpha && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6219 ABS( p1 - p0 ) < beta && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6220 ABS( q1 - q0 ) < beta ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6221 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6222 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
|
6223 if( ABS( p2 - p0 ) < beta) |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6224 { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6225 const int p3 = pix[-4]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6226 /* p0', p1', p2' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6227 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
|
6228 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
|
6229 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
|
6230 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6231 /* p0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6232 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
|
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 { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6236 const int q3 = pix[3]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6237 /* q0', q1', q2' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6238 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
|
6239 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
|
6240 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
|
6241 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6242 /* q0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6243 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
|
6244 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6245 }else{ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6246 /* p0', q0' */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6247 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
|
6248 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
|
6249 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6250 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
|
6251 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6252 } |
|
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 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6255 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
|
6256 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6257 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
|
6258 int index_a; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6259 int alpha; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6260 int beta; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6261 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6262 int qp_index; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6263 int bS_index = i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6264 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6265 if( bS[bS_index] == 0 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6266 continue; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6267 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6268 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6269 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
|
6270 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
|
6271 alpha = alpha_table[index_a]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6272 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
|
6273 if( bS[bS_index] < 4 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6274 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
|
6275 /* 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
|
6276 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6277 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6278 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6279 const int q1 = pix[1]; |
|
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 if( ABS( p0 - q0 ) < alpha && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6282 ABS( p1 - p0 ) < beta && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6283 ABS( q1 - q0 ) < beta ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6284 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
|
6285 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6286 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
|
6287 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
|
6288 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
|
6289 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6290 }else{ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6291 const int p0 = pix[-1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6292 const int p1 = pix[-2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6293 const int q0 = pix[0]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6294 const int q1 = pix[1]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6295 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6296 if( ABS( p0 - q0 ) < alpha && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6297 ABS( p1 - p0 ) < beta && |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6298 ABS( q1 - q0 ) < beta ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6299 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6300 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
|
6301 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
|
6302 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
|
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 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6306 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6307 |
|
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
|
6308 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
|
6309 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
|
6310 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
|
6311 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
|
6312 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
|
6313 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
|
6314 |
| 2633 | 6315 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
|
6316 int8_t tc[4]; |
| 2633 | 6317 for(i=0; i<4; i++) |
| 6318 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] : -1; | |
| 6319 h->s.dsp.h264_v_loop_filter_luma(pix, stride, alpha, beta, tc); | |
| 6320 } else { | |
| 6321 /* 16px edge length, see filter_mb_edgev */ | |
| 6322 for( d = 0; d < 16; d++ ) { | |
| 1898 | 6323 const int p0 = pix[-1*pix_next]; |
| 6324 const int p1 = pix[-2*pix_next]; | |
| 6325 const int p2 = pix[-3*pix_next]; | |
| 6326 const int q0 = pix[0]; | |
| 6327 const int q1 = pix[1*pix_next]; | |
| 6328 const int q2 = pix[2*pix_next]; | |
| 6329 | |
| 6330 if( ABS( p0 - q0 ) < alpha && | |
| 6331 ABS( p1 - p0 ) < beta && | |
| 6332 ABS( q1 - q0 ) < beta ) { | |
| 6333 | |
| 6334 const int p3 = pix[-4*pix_next]; | |
| 6335 const int q3 = pix[ 3*pix_next]; | |
| 6336 | |
| 6337 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){ | |
| 6338 if( ABS( p2 - p0 ) < beta) { | |
| 6339 /* p0', p1', p2' */ | |
| 6340 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3; | |
| 6341 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2; | |
| 6342 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3; | |
| 6343 } else { | |
| 6344 /* p0' */ | |
| 6345 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6346 } | |
| 6347 if( ABS( q2 - q0 ) < beta) { | |
| 6348 /* q0', q1', q2' */ | |
| 6349 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3; | |
| 6350 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2; | |
| 6351 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3; | |
| 6352 } else { | |
| 6353 /* q0' */ | |
| 6354 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6355 } | |
| 6356 }else{ | |
| 6357 /* p0', q0' */ | |
| 6358 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; | |
| 6359 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2; | |
| 6360 } | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6361 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
|
6362 } |
| 1898 | 6363 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
|
6364 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6365 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6366 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6367 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6368 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
|
6369 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
|
6370 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
|
6371 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
|
6372 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
|
6373 |
| 2633 | 6374 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
|
6375 int8_t tc[4]; |
| 2633 | 6376 for(i=0; i<4; i++) |
| 6377 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] + 1 : 0; | |
| 6378 h->s.dsp.h264_v_loop_filter_chroma(pix, stride, alpha, beta, tc); | |
| 6379 } else { | |
|
2707
360024d31dab
H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents:
2683
diff
changeset
|
6380 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
|
6381 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6382 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6383 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6384 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
|
6385 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
|
6386 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
|
6387 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
|
6388 int dir; |
|
2629
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
6389 /* 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
|
6390 * 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
|
6391 * frame numbers, not indices. */ |
|
202cd69d8d2e
fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents:
2628
diff
changeset
|
6392 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
|
6393 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6394 if (h->mb_aff_frame |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6395 // left mb is in picture |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6396 && 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
|
6397 // 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
|
6398 && (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
|
6399 // 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
|
6400 && (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
|
6401 /* 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
|
6402 * 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
|
6403 */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6404 int bS[8]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6405 int qp[2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6406 int chroma_qp[2]; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6407 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6408 int i; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6409 first_vertical_edge_done = 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6410 for( i = 0; i < 8; i++ ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6411 int y = i>>1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6412 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
|
6413 int bn_idx= b_idx - 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6414 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6415 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
|
6416 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6417 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
|
6418 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
|
6419 bS[i] = 4; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6420 } else if( h->non_zero_count_cache[b_idx] != 0 || |
| 2755 | 6421 /* 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
|
6422 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
|
6423 bS[i] = 2; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6424 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6425 int l; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6426 bS[i] = 0; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6427 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
|
6428 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
|
6429 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
|
6430 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
|
6431 bS[i] = 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6432 break; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6433 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6434 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6435 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6436 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6437 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
|
6438 // 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
|
6439 // value in IPCM macroblocks. |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6440 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
|
6441 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
|
6442 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
|
6443 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
|
6444 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
|
6445 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
|
6446 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6447 /* Filter edge */ |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6448 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
|
6449 { 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
|
6450 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
|
6451 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
|
6452 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
|
6453 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6454 } |
|
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
|
6455 /* 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
|
6456 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
|
6457 { |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6458 int edge; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6459 const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy; |
| 2454 | 6460 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0; |
| 6461 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6462 if (first_vertical_edge_done) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6463 start = 1; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6464 first_vertical_edge_done = 0; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6465 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6466 |
| 2454 | 6467 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
|
6468 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
|
6469 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6470 /* 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
|
6471 for( edge = start; edge < 4; edge++ ) { |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6472 /* mbn_xy: neighbor macroblock */ |
| 2454 | 6473 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
|
6474 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
|
6475 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
|
6476 |
| 2755 | 6477 if( (edge&1) && IS_8x8DCT(s->current_picture.mb_type[mb_xy]) ) |
| 6478 continue; | |
| 6479 | |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6480 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
|
6481 && !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
|
6482 && 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
|
6483 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6484 // 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
|
6485 // 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
|
6486 // frame macroblock. |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6487 // |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6488 unsigned int tmp_linesize = 2 * linesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6489 unsigned int tmp_uvlinesize = 2 * uvlinesize; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6490 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
|
6491 int qp, chroma_qp; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6492 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6493 // first filtering |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6494 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
|
6495 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
|
6496 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
|
6497 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6498 // TODO |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6499 assert(0); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6500 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6501 /* Filter edge */ |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6502 // 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
|
6503 // value in IPCM macroblocks. |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6504 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
|
6505 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
|
6506 { 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
|
6507 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
|
6508 chroma_qp = ( h->chroma_qp + |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6509 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
|
6510 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
|
6511 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
|
6512 |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6513 // second filtering |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6514 mbn_xy += s->mb_stride; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6515 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
|
6516 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
|
6517 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
|
6518 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6519 // TODO |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6520 assert(0); |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6521 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6522 /* Filter edge */ |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6523 // 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
|
6524 // value in IPCM macroblocks. |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6525 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
|
6526 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
|
6527 { 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
|
6528 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
|
6529 chroma_qp = ( h->chroma_qp + |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6530 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
|
6531 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
|
6532 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
|
6533 continue; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6534 } |
|
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
|
6535 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
|
6536 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
|
6537 int value; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6538 if (edge == 0) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6539 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
|
6540 || ((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
|
6541 ) { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6542 value = 4; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6543 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6544 value = 3; |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6545 } |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6546 } else { |
|
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6547 value = 3; |
|
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 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
|
6550 } 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
|
6551 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
|
6552 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
|
6553 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
|
6554 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
|
6555 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
|
6556 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
|
6557 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
6558 if( h->non_zero_count_cache[b_idx] != 0 || |
| 2449 | 6559 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
|
6560 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
|
6561 } |
| 2523 | 6562 else |
| 6563 { | |
| 6564 int l; | |
| 6565 bS[i] = 0; | |
| 6566 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
|
6567 if( ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] || |
| 2523 | 6568 ABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 || |
| 6569 ABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= 4 ) { | |
| 6570 bS[i] = 1; | |
| 6571 break; | |
| 6572 } | |
| 6573 } | |
|
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
|
6574 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6575 } |
|
1899
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
6576 |
|
379a18a7131f
do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents:
1898
diff
changeset
|
6577 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
|
6578 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
|
6579 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6580 |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6581 /* Filter edge */ |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
6582 // 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
|
6583 // value in IPCM macroblocks. |
|
f12657081093
INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents:
2498
diff
changeset
|
6584 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
|
6585 //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
|
6586 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
|
6587 { 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
|
6588 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
|
6589 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp ); |
| 1898 | 6590 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
|
6591 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
|
6592 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
|
6593 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
|
6594 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
|
6595 } |
|
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 } 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
|
6597 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp ); |
| 1898 | 6598 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
|
6599 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
|
6600 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
|
6601 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
|
6602 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
|
6603 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6604 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6605 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6606 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6607 } |
|
4e8ed93524f6
h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1892
diff
changeset
|
6608 |
| 1168 | 6609 static int decode_slice(H264Context *h){ |
| 6610 MpegEncContext * const s = &h->s; | |
| 6611 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; | |
| 6612 | |
| 6613 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
|
6614 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6615 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
|
6616 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
|
6617 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6618 /* realign */ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6619 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
|
6620 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6621 /* 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
|
6622 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
|
6623 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
|
6624 s->gb.buffer + get_bits_count(&s->gb)/8, |
| 2116 | 6625 ( 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
|
6626 /* calculate pre-state */ |
| 2755 | 6627 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
|
6628 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
|
6629 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
|
6630 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
|
6631 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6632 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
|
6633 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6634 if( 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
|
6635 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
|
6636 else |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6637 h->cabac_state[i] = 2 * ( pre - 64 ) + 1; |
| 1168 | 6638 } |
| 6639 | |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6640 for(;;){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6641 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
|
6642 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
|
6643 |
| 2163 | 6644 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
|
6645 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6646 /* 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
|
6647 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
|
6648 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
|
6649 |
| 2163 | 6650 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
|
6651 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6652 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
|
6653 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
|
6654 } |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6655 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
|
6656 |
| 2116 | 6657 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
|
6658 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
|
6659 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
|
6660 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
|
6661 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6662 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6663 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
|
6664 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
|
6665 ff_draw_horiz_band(s, 16*s->mb_y, 16); |
| 2392 | 6666 ++s->mb_y; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6667 if(h->mb_aff_frame) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6668 ++s->mb_y; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6669 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6670 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6671 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6672 if( eos || s->mb_y >= s->mb_height ) { |
| 2392 | 6673 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
|
6674 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
|
6675 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
|
6676 } |
| 1168 | 6677 } |
|
1908
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6678 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6679 } else { |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6680 for(;;){ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6681 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
|
6682 |
| 2163 | 6683 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
|
6684 |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6685 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
|
6686 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
|
6687 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
|
6688 |
| 2163 | 6689 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
|
6690 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
|
6691 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6692 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6693 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
|
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 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6697 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
|
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 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6700 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
|
6701 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
|
6702 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
|
6703 ++s->mb_y; |
|
2581
ae72796e722f
This is the second patch for MBAFF support, this adds the deblocking
michael
parents:
2580
diff
changeset
|
6704 if(h->mb_aff_frame) { |
|
2551
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6705 ++s->mb_y; |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6706 } |
|
615995277bc5
MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents:
2548
diff
changeset
|
6707 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
|
6708 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
|
6709 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6710 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
|
6711 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
|
6712 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6713 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
|
6714 }else{ |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6715 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
|
6716 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6717 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
|
6718 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6719 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6720 } |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6721 |
|
e20fd60b215c
h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1899
diff
changeset
|
6722 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){ |
| 2392 | 6723 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
|
6724 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){ |
| 1168 | 6725 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); |
| 6726 | |
| 6727 return 0; | |
| 6728 }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
|
6729 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 | 6730 |
| 6731 return -1; | |
| 6732 } | |
| 6733 } | |
| 6734 } | |
|
1908
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 |
| 1168 | 6737 #if 0 |
| 6738 for(;s->mb_y < s->mb_height; s->mb_y++){ | |
| 6739 for(;s->mb_x < s->mb_width; s->mb_x++){ | |
| 6740 int ret= decode_mb(h); | |
| 6741 | |
| 6742 hl_decode_mb(h); | |
| 6743 | |
| 6744 if(ret<0){ | |
| 6745 fprintf(stderr, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); | |
| 6746 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); | |
| 6747 | |
| 6748 return -1; | |
| 6749 } | |
| 6750 | |
| 6751 if(++s->mb_x >= s->mb_width){ | |
| 6752 s->mb_x=0; | |
| 6753 if(++s->mb_y >= s->mb_height){ | |
| 6754 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
| 6755 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); | |
| 6756 | |
| 6757 return 0; | |
| 6758 }else{ | |
| 6759 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); | |
| 6760 | |
| 6761 return -1; | |
| 6762 } | |
| 6763 } | |
| 6764 } | |
| 6765 | |
| 6766 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){ | |
| 6767 if(get_bits_count(s->gb) == s->gb.size_in_bits){ | |
| 6768 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); | |
| 6769 | |
| 6770 return 0; | |
| 6771 }else{ | |
| 6772 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); | |
| 6773 | |
| 6774 return -1; | |
| 6775 } | |
| 6776 } | |
| 6777 } | |
| 6778 s->mb_x=0; | |
| 6779 ff_draw_horiz_band(s, 16*s->mb_y, 16); | |
| 6780 } | |
| 6781 #endif | |
| 6782 return -1; //not reached | |
| 6783 } | |
| 6784 | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6785 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
|
6786 MpegEncContext * const s = &h->s; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6787 int cpb_count, i; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6788 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
|
6789 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
|
6790 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
|
6791 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
|
6792 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
|
6793 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
|
6794 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
|
6795 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6796 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
|
6797 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
|
6798 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
|
6799 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
|
6800 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6801 |
| 1168 | 6802 static inline int decode_vui_parameters(H264Context *h, SPS *sps){ |
| 6803 MpegEncContext * const s = &h->s; | |
| 6804 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
|
6805 int nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag; |
| 1168 | 6806 |
| 6807 aspect_ratio_info_present_flag= get_bits1(&s->gb); | |
| 6808 | |
| 6809 if( aspect_ratio_info_present_flag ) { | |
| 6810 aspect_ratio_idc= get_bits(&s->gb, 8); | |
| 6811 if( aspect_ratio_idc == EXTENDED_SAR ) { | |
| 1548 | 6812 sps->sar.num= get_bits(&s->gb, 16); |
| 6813 sps->sar.den= get_bits(&s->gb, 16); | |
| 1168 | 6814 }else if(aspect_ratio_idc < 16){ |
| 1548 | 6815 sps->sar= pixel_aspect[aspect_ratio_idc]; |
| 1168 | 6816 }else{ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
6817 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n"); |
| 1168 | 6818 return -1; |
| 6819 } | |
| 6820 }else{ | |
| 1548 | 6821 sps->sar.num= |
| 6822 sps->sar.den= 0; | |
| 1168 | 6823 } |
| 6824 // 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
|
6825 |
|
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
|
6826 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
|
6827 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
|
6828 } |
|
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
|
6829 |
|
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
|
6830 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
|
6831 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
|
6832 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
|
6833 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
|
6834 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
|
6835 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
|
6836 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
|
6837 } |
|
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
|
6838 } |
|
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
|
6839 |
|
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
|
6840 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
|
6841 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
|
6842 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
|
6843 } |
|
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
|
6844 |
|
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
|
6845 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
|
6846 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
|
6847 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
|
6848 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
|
6849 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
|
6850 } |
|
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
|
6851 |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6852 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
|
6853 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
|
6854 decode_hrd_parameters(h, sps); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6855 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
|
6856 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
|
6857 decode_hrd_parameters(h, sps); |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6858 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
|
6859 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
|
6860 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
|
6861 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6862 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
|
6863 if(sps->bitstream_restriction_flag){ |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6864 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
|
6865 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
|
6866 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
|
6867 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
|
6868 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
|
6869 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
|
6870 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
|
6871 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
6872 |
| 1168 | 6873 return 0; |
| 6874 } | |
| 6875 | |
| 6876 static inline int decode_seq_parameter_set(H264Context *h){ | |
| 6877 MpegEncContext * const s = &h->s; | |
| 1371 | 6878 int profile_idc, level_idc; |
| 1168 | 6879 int sps_id, i; |
| 6880 SPS *sps; | |
| 6881 | |
| 6882 profile_idc= get_bits(&s->gb, 8); | |
| 1371 | 6883 get_bits1(&s->gb); //constraint_set0_flag |
| 6884 get_bits1(&s->gb); //constraint_set1_flag | |
| 6885 get_bits1(&s->gb); //constraint_set2_flag | |
| 2312 | 6886 get_bits1(&s->gb); //constraint_set3_flag |
| 6887 get_bits(&s->gb, 4); // reserved | |
| 1168 | 6888 level_idc= get_bits(&s->gb, 8); |
| 6889 sps_id= get_ue_golomb(&s->gb); | |
| 6890 | |
| 6891 sps= &h->sps_buffer[ sps_id ]; | |
| 6892 sps->profile_idc= profile_idc; | |
| 6893 sps->level_idc= level_idc; | |
| 2312 | 6894 |
| 2755 | 6895 if(sps->profile_idc >= 100){ //high profile |
| 6896 if(get_ue_golomb(&s->gb) == 3) //chroma_format_idc | |
| 6897 get_bits1(&s->gb); //residual_color_transform_flag | |
| 6898 get_ue_golomb(&s->gb); //bit_depth_luma_minus8 | |
| 6899 get_ue_golomb(&s->gb); //bit_depth_chroma_minus8 | |
| 6900 get_bits1(&s->gb); //qpprime_y_zero_transform_bypass_flag | |
| 6901 if(get_bits1(&s->gb)){ //seq_scaling_matrix_present_flag | |
| 6902 av_log(h->s.avctx, AV_LOG_ERROR, "custom scaling matrix not implemented\n"); | |
| 6903 return -1; | |
| 6904 } | |
| 6905 } | |
| 6906 | |
| 1168 | 6907 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4; |
| 6908 sps->poc_type= get_ue_golomb(&s->gb); | |
| 6909 | |
| 6910 if(sps->poc_type == 0){ //FIXME #define | |
| 6911 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4; | |
| 6912 } else if(sps->poc_type == 1){//FIXME #define | |
| 6913 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb); | |
| 6914 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb); | |
| 6915 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb); | |
| 6916 sps->poc_cycle_length= get_ue_golomb(&s->gb); | |
| 6917 | |
| 6918 for(i=0; i<sps->poc_cycle_length; i++) | |
| 6919 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb); | |
| 6920 } | |
| 6921 if(sps->poc_type > 2){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
6922 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type); |
| 1168 | 6923 return -1; |
| 6924 } | |
| 6925 | |
| 6926 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
|
6927 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
|
6928 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
|
6929 } |
| 1371 | 6930 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb); |
| 1168 | 6931 sps->mb_width= get_ue_golomb(&s->gb) + 1; |
| 6932 sps->mb_height= get_ue_golomb(&s->gb) + 1; | |
| 2422 | 6933 if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 || |
| 6934 avcodec_check_dimensions(NULL, 16*sps->mb_width, 16*sps->mb_height)) | |
| 6935 return -1; | |
| 6936 | |
| 1168 | 6937 sps->frame_mbs_only_flag= get_bits1(&s->gb); |
| 6938 if(!sps->frame_mbs_only_flag) | |
| 6939 sps->mb_aff= get_bits1(&s->gb); | |
| 6940 else | |
| 6941 sps->mb_aff= 0; | |
| 6942 | |
| 6943 sps->direct_8x8_inference_flag= get_bits1(&s->gb); | |
| 6944 | |
| 1371 | 6945 sps->crop= get_bits1(&s->gb); |
| 6946 if(sps->crop){ | |
| 6947 sps->crop_left = get_ue_golomb(&s->gb); | |
| 6948 sps->crop_right = get_ue_golomb(&s->gb); | |
| 6949 sps->crop_top = get_ue_golomb(&s->gb); | |
| 6950 sps->crop_bottom= get_ue_golomb(&s->gb); | |
| 6951 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
|
6952 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n"); |
| 1371 | 6953 } |
| 6954 }else{ | |
| 6955 sps->crop_left = | |
| 6956 sps->crop_right = | |
| 6957 sps->crop_top = | |
| 6958 sps->crop_bottom= 0; | |
| 6959 } | |
| 6960 | |
| 1168 | 6961 sps->vui_parameters_present_flag= get_bits1(&s->gb); |
| 6962 if( sps->vui_parameters_present_flag ) | |
| 6963 decode_vui_parameters(h, sps); | |
| 6964 | |
| 6965 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
|
6966 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 | 6967 sps_id, sps->profile_idc, sps->level_idc, |
| 6968 sps->poc_type, | |
| 6969 sps->ref_frame_count, | |
| 6970 sps->mb_width, sps->mb_height, | |
| 6971 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"), | |
| 6972 sps->direct_8x8_inference_flag ? "8B8" : "", | |
| 1371 | 6973 sps->crop_left, sps->crop_right, |
| 6974 sps->crop_top, sps->crop_bottom, | |
| 1168 | 6975 sps->vui_parameters_present_flag ? "VUI" : "" |
| 6976 ); | |
| 6977 } | |
| 6978 return 0; | |
| 6979 } | |
| 6980 | |
| 2755 | 6981 static inline int decode_picture_parameter_set(H264Context *h, int bit_length){ |
| 1168 | 6982 MpegEncContext * const s = &h->s; |
| 6983 int pps_id= get_ue_golomb(&s->gb); | |
| 6984 PPS *pps= &h->pps_buffer[pps_id]; | |
| 6985 | |
| 6986 pps->sps_id= get_ue_golomb(&s->gb); | |
| 6987 pps->cabac= get_bits1(&s->gb); | |
| 6988 pps->pic_order_present= get_bits1(&s->gb); | |
| 6989 pps->slice_group_count= get_ue_golomb(&s->gb) + 1; | |
| 6990 if(pps->slice_group_count > 1 ){ | |
| 6991 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
|
6992 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n"); |
| 1168 | 6993 switch(pps->mb_slice_group_map_type){ |
| 6994 case 0: | |
| 6995 #if 0 | |
| 6996 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | | | |
| 6997 | run_length[ i ] |1 |ue(v) | | |
| 6998 #endif | |
| 6999 break; | |
| 7000 case 2: | |
| 7001 #if 0 | |
| 7002 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | | | |
| 7003 |{ | | | | |
| 7004 | top_left_mb[ i ] |1 |ue(v) | | |
| 7005 | bottom_right_mb[ i ] |1 |ue(v) | | |
| 7006 | } | | | | |
| 7007 #endif | |
| 7008 break; | |
| 7009 case 3: | |
| 7010 case 4: | |
| 7011 case 5: | |
| 7012 #if 0 | |
| 7013 | slice_group_change_direction_flag |1 |u(1) | | |
| 7014 | slice_group_change_rate_minus1 |1 |ue(v) | | |
| 7015 #endif | |
| 7016 break; | |
| 7017 case 6: | |
| 7018 #if 0 | |
| 7019 | slice_group_id_cnt_minus1 |1 |ue(v) | | |
| 7020 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | | | |
| 7021 |) | | | | |
| 7022 | slice_group_id[ i ] |1 |u(v) | | |
| 7023 #endif | |
| 1214 | 7024 break; |
| 1168 | 7025 } |
| 7026 } | |
| 7027 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1; | |
| 7028 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1; | |
| 7029 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
|
7030 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n"); |
| 1168 | 7031 return -1; |
| 7032 } | |
| 7033 | |
| 7034 pps->weighted_pred= get_bits1(&s->gb); | |
| 7035 pps->weighted_bipred_idc= get_bits(&s->gb, 2); | |
| 7036 pps->init_qp= get_se_golomb(&s->gb) + 26; | |
| 7037 pps->init_qs= get_se_golomb(&s->gb) + 26; | |
| 7038 pps->chroma_qp_index_offset= get_se_golomb(&s->gb); | |
| 7039 pps->deblocking_filter_parameters_present= get_bits1(&s->gb); | |
| 7040 pps->constrained_intra_pred= get_bits1(&s->gb); | |
| 7041 pps->redundant_pic_cnt_present = get_bits1(&s->gb); | |
| 2755 | 7042 |
| 7043 if(get_bits_count(&s->gb) < bit_length){ | |
| 7044 pps->transform_8x8_mode= get_bits1(&s->gb); | |
| 7045 if(get_bits1(&s->gb)){ //pic_scaling_matrix_present_flag | |
| 7046 av_log(h->s.avctx, AV_LOG_ERROR, "custom scaling matrix not implemented\n"); | |
| 7047 return -1; | |
| 7048 } | |
| 7049 get_se_golomb(&s->gb); //second_chroma_qp_index_offset | |
| 7050 } | |
| 1168 | 7051 |
| 7052 if(s->avctx->debug&FF_DEBUG_PICT_INFO){ | |
| 2755 | 7053 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 | 7054 pps_id, pps->sps_id, |
| 7055 pps->cabac ? "CABAC" : "CAVLC", | |
| 7056 pps->slice_group_count, | |
| 7057 pps->ref_count[0], pps->ref_count[1], | |
| 7058 pps->weighted_pred ? "weighted" : "", | |
| 7059 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset, | |
| 7060 pps->deblocking_filter_parameters_present ? "LPAR" : "", | |
| 7061 pps->constrained_intra_pred ? "CONSTR" : "", | |
| 2755 | 7062 pps->redundant_pic_cnt_present ? "REDU" : "", |
| 7063 pps->transform_8x8_mode ? "8x8DCT" : "" | |
| 1168 | 7064 ); |
| 7065 } | |
| 7066 | |
| 7067 return 0; | |
| 7068 } | |
| 7069 | |
| 7070 /** | |
| 7071 * finds the end of the current frame in the bitstream. | |
| 7072 * @return the position of the first byte of the next frame, or -1 | |
| 7073 */ | |
| 2392 | 7074 static int find_frame_end(H264Context *h, const uint8_t *buf, int buf_size){ |
| 1187 | 7075 int i; |
| 1168 | 7076 uint32_t state; |
| 2392 | 7077 ParseContext *pc = &(h->s.parse_context); |
| 1168 | 7078 //printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]); |
| 7079 // mb_addr= pc->mb_addr - 1; | |
| 7080 state= pc->state; | |
| 2392 | 7081 for(i=0; i<=buf_size; i++){ |
| 1168 | 7082 if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){ |
| 2392 | 7083 tprintf("find_frame_end new startcode = %08x, frame_start_found = %d, pos = %d\n", state, pc->frame_start_found, i); |
| 1168 | 7084 if(pc->frame_start_found){ |
| 2392 | 7085 // If there isn't one more byte in the buffer |
| 7086 // the test on first_mb_in_slice cannot be done yet | |
| 7087 // do it at next call. | |
| 7088 if (i >= buf_size) break; | |
| 7089 if (buf[i] & 0x80) { | |
| 7090 // first_mb_in_slice is 0, probably the first nal of a new | |
| 7091 // slice | |
| 7092 tprintf("find_frame_end frame_end_found, state = %08x, pos = %d\n", state, i); | |
| 7093 pc->state=-1; | |
| 7094 pc->frame_start_found= 0; | |
| 7095 return i-4; | |
| 7096 } | |
| 1168 | 7097 } |
| 2392 | 7098 pc->frame_start_found = 1; |
| 1168 | 7099 } |
| 2392 | 7100 if (i<buf_size) |
| 7101 state= (state<<8) | buf[i]; | |
| 1168 | 7102 } |
| 7103 | |
| 7104 pc->state= state; | |
| 1219 | 7105 return END_NOT_FOUND; |
| 1168 | 7106 } |
| 7107 | |
| 1988 | 7108 static int h264_parse(AVCodecParserContext *s, |
| 7109 AVCodecContext *avctx, | |
| 7110 uint8_t **poutbuf, int *poutbuf_size, | |
| 7111 const uint8_t *buf, int buf_size) | |
| 7112 { | |
| 2392 | 7113 H264Context *h = s->priv_data; |
| 7114 ParseContext *pc = &h->s.parse_context; | |
| 1988 | 7115 int next; |
| 7116 | |
| 2392 | 7117 next= find_frame_end(h, buf, buf_size); |
| 1988 | 7118 |
| 7119 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { | |
| 7120 *poutbuf = NULL; | |
| 7121 *poutbuf_size = 0; | |
| 7122 return buf_size; | |
| 7123 } | |
| 7124 | |
| 7125 *poutbuf = (uint8_t *)buf; | |
| 7126 *poutbuf_size = buf_size; | |
| 7127 return next; | |
| 7128 } | |
| 7129 | |
| 1168 | 7130 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ |
| 7131 MpegEncContext * const s = &h->s; | |
| 7132 AVCodecContext * const avctx= s->avctx; | |
| 7133 int buf_index=0; | |
| 1322 | 7134 #if 0 |
| 1168 | 7135 int i; |
| 7136 for(i=0; i<32; i++){ | |
| 7137 printf("%X ", buf[i]); | |
| 7138 } | |
| 7139 #endif | |
| 2392 | 7140 h->slice_num = 0; |
| 1168 | 7141 for(;;){ |
| 7142 int consumed; | |
| 7143 int dst_length; | |
| 7144 int bit_length; | |
| 7145 uint8_t *ptr; | |
| 2227 | 7146 int i, nalsize = 0; |
| 1168 | 7147 |
| 2227 | 7148 if(h->is_avc) { |
| 7149 if(buf_index >= buf_size) break; | |
| 7150 nalsize = 0; | |
| 7151 for(i = 0; i < h->nal_length_size; i++) | |
| 7152 nalsize = (nalsize << 8) | buf[buf_index++]; | |
| 7153 } else { | |
| 1168 | 7154 // start code prefix search |
| 7155 for(; buf_index + 3 < buf_size; buf_index++){ | |
| 7156 // this should allways succeed in the first iteration | |
| 7157 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | |
| 7158 break; | |
| 7159 } | |
| 7160 | |
| 7161 if(buf_index+3 >= buf_size) break; | |
| 7162 | |
| 7163 buf_index+=3; | |
| 2227 | 7164 } |
| 1168 | 7165 |
|
2401
46898a9fd6dc
Fix avc1 if there is nore than one nal per mov frame
rtognimp
parents:
2396
diff
changeset
|
7166 ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index); |
| 1168 | 7167 if(ptr[dst_length - 1] == 0) dst_length--; |
| 7168 bit_length= 8*dst_length - decode_rbsp_trailing(ptr + dst_length - 1); | |
| 7169 | |
| 7170 if(s->avctx->debug&FF_DEBUG_STARTCODE){ | |
|
2402
f9d4e1eddbc5
- correct several errors on the deblocking accross slice boundaries.
michael
parents:
2401
diff
changeset
|
7171 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 | 7172 } |
| 7173 | |
| 2227 | 7174 if (h->is_avc && (nalsize != consumed)) |
| 7175 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); | |
| 7176 | |
| 1168 | 7177 buf_index += consumed; |
| 7178 | |
|
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
|
7179 if( s->hurry_up == 1 && h->nal_ref_idc == 0 ) |
| 1168 | 7180 continue; |
| 7181 | |
| 7182 switch(h->nal_unit_type){ | |
| 7183 case NAL_IDR_SLICE: | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7184 idr(h); //FIXME ensure we don't loose some frames if there is reordering |
| 1168 | 7185 case NAL_SLICE: |
| 7186 init_get_bits(&s->gb, ptr, bit_length); | |
| 7187 h->intra_gb_ptr= | |
| 7188 h->inter_gb_ptr= &s->gb; | |
| 7189 s->data_partitioning = 0; | |
| 7190 | |
| 7191 if(decode_slice_header(h) < 0) return -1; | |
|
1956
0eb2947f56f6
h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents:
1935
diff
changeset
|
7192 if(h->redundant_pic_count==0 && s->hurry_up < 5 ) |
| 1168 | 7193 decode_slice(h); |
| 7194 break; | |
| 7195 case NAL_DPA: | |
| 7196 init_get_bits(&s->gb, ptr, bit_length); | |
| 7197 h->intra_gb_ptr= | |
| 7198 h->inter_gb_ptr= NULL; | |
| 7199 s->data_partitioning = 1; | |
| 7200 | |
| 7201 if(decode_slice_header(h) < 0) return -1; | |
| 7202 break; | |
| 7203 case NAL_DPB: | |
| 7204 init_get_bits(&h->intra_gb, ptr, bit_length); | |
| 7205 h->intra_gb_ptr= &h->intra_gb; | |
| 7206 break; | |
| 7207 case NAL_DPC: | |
| 7208 init_get_bits(&h->inter_gb, ptr, bit_length); | |
| 7209 h->inter_gb_ptr= &h->inter_gb; | |
| 1174 | 7210 |
|
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
|
7211 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning && s->hurry_up < 5 ) |
| 1168 | 7212 decode_slice(h); |
| 7213 break; | |
| 7214 case NAL_SEI: | |
| 7215 break; | |
| 7216 case NAL_SPS: | |
| 7217 init_get_bits(&s->gb, ptr, bit_length); | |
| 7218 decode_seq_parameter_set(h); | |
| 7219 | |
| 7220 if(s->flags& CODEC_FLAG_LOW_DELAY) | |
| 7221 s->low_delay=1; | |
| 7222 | |
| 2538 | 7223 if(avctx->has_b_frames < 2) |
| 7224 avctx->has_b_frames= !s->low_delay; | |
| 1168 | 7225 break; |
| 7226 case NAL_PPS: | |
| 7227 init_get_bits(&s->gb, ptr, bit_length); | |
| 7228 | |
| 2755 | 7229 decode_picture_parameter_set(h, bit_length); |
| 1168 | 7230 |
| 7231 break; | |
| 7232 case NAL_PICTURE_DELIMITER: | |
| 7233 break; | |
| 7234 case NAL_FILTER_DATA: | |
| 7235 break; | |
| 2099 | 7236 default: |
| 7237 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type); | |
| 1168 | 7238 } |
| 7239 } | |
| 7240 | |
| 1174 | 7241 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
|
7242 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7243 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
|
7244 s->current_picture_ptr->key_frame= s->pict_type == I_TYPE && h->nal_unit_type == NAL_IDR_SLICE; |
| 1174 | 7245 |
| 1168 | 7246 h->prev_frame_num_offset= h->frame_num_offset; |
| 7247 h->prev_frame_num= h->frame_num; | |
| 7248 if(s->current_picture_ptr->reference){ | |
| 7249 h->prev_poc_msb= h->poc_msb; | |
| 7250 h->prev_poc_lsb= h->poc_lsb; | |
| 7251 } | |
| 7252 if(s->current_picture_ptr->reference) | |
| 7253 execute_ref_pic_marking(h, h->mmco, h->mmco_index); | |
| 7254 | |
| 7255 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
|
7256 |
| 1168 | 7257 MPV_frame_end(s); |
| 7258 | |
| 7259 return buf_index; | |
| 7260 } | |
| 7261 | |
| 7262 /** | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7263 * returns the number of bytes consumed for building the current frame |
| 1168 | 7264 */ |
| 7265 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){ | |
| 7266 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
| 7267 pos -= s->parse_context.last_index; | |
|
2645
42528c1f0246
More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents:
2641
diff
changeset
|
7268 if(pos<0) pos=0; // FIXME remove (unneeded?) |
| 1168 | 7269 |
| 7270 return pos; | |
| 7271 }else{ | |
| 7272 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...) | |
| 7273 if(pos+10>buf_size) pos=buf_size; // oops ;) | |
| 7274 | |
| 7275 return pos; | |
| 7276 } | |
| 7277 } | |
| 7278 | |
| 7279 static int decode_frame(AVCodecContext *avctx, | |
| 7280 void *data, int *data_size, | |
| 7281 uint8_t *buf, int buf_size) | |
| 7282 { | |
| 7283 H264Context *h = avctx->priv_data; | |
| 7284 MpegEncContext *s = &h->s; | |
| 7285 AVFrame *pict = data; | |
| 7286 int buf_index; | |
| 7287 | |
| 7288 s->flags= avctx->flags; | |
|
1754
bdf3927bf8c5
closed gop support & flags2 as all bits in flags are used
michael
parents:
1706
diff
changeset
|
7289 s->flags2= avctx->flags2; |
| 1168 | 7290 |
| 7291 /* no supplementary picture */ | |
| 7292 if (buf_size == 0) { | |
| 7293 return 0; | |
| 7294 } | |
| 7295 | |
| 7296 if(s->flags&CODEC_FLAG_TRUNCATED){ | |
| 2392 | 7297 int next= find_frame_end(h, buf, buf_size); |
| 1168 | 7298 |
| 1988 | 7299 if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 ) |
| 1168 | 7300 return buf_size; |
| 7301 //printf("next:%d buf_size:%d last_index:%d\n", next, buf_size, s->parse_context.last_index); | |
| 7302 } | |
| 7303 | |
| 2227 | 7304 if(h->is_avc && !h->got_avcC) { |
| 7305 int i, cnt, nalsize; | |
| 7306 unsigned char *p = avctx->extradata; | |
| 7307 if(avctx->extradata_size < 7) { | |
| 7308 av_log(avctx, AV_LOG_ERROR, "avcC too short\n"); | |
| 7309 return -1; | |
| 7310 } | |
| 7311 if(*p != 1) { | |
| 7312 av_log(avctx, AV_LOG_ERROR, "Unknown avcC version %d\n", *p); | |
| 7313 return -1; | |
| 7314 } | |
| 7315 /* sps and pps in the avcC always have length coded with 2 bytes, | |
| 7316 so put a fake nal_length_size = 2 while parsing them */ | |
| 7317 h->nal_length_size = 2; | |
| 7318 // Decode sps from avcC | |
| 7319 cnt = *(p+5) & 0x1f; // Number of sps | |
| 7320 p += 6; | |
| 7321 for (i = 0; i < cnt; i++) { | |
| 7322 nalsize = BE_16(p) + 2; | |
| 7323 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
| 7324 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i); | |
| 7325 return -1; | |
| 7326 } | |
| 7327 p += nalsize; | |
| 7328 } | |
| 7329 // Decode pps from avcC | |
| 7330 cnt = *(p++); // Number of pps | |
| 7331 for (i = 0; i < cnt; i++) { | |
| 7332 nalsize = BE_16(p) + 2; | |
| 7333 if(decode_nal_units(h, p, nalsize) != nalsize) { | |
| 7334 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); | |
| 7335 return -1; | |
| 7336 } | |
| 7337 p += nalsize; | |
| 7338 } | |
| 7339 // Now store right nal length size, that will be use to parse all other nals | |
| 7340 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1; | |
| 7341 // Do not reparse avcC | |
| 7342 h->got_avcC = 1; | |
| 7343 } | |
| 7344 | |
| 7345 if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){ | |
| 1168 | 7346 if(0 < decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) ) |
| 7347 return -1; | |
| 7348 } | |
| 7349 | |
| 7350 buf_index=decode_nal_units(h, buf, buf_size); | |
| 7351 if(buf_index < 0) | |
| 7352 return -1; | |
| 7353 | |
| 7354 //FIXME do something with unavailable reference frames | |
| 7355 | |
|
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
|
7356 // if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_index, buf_size); |
| 1174 | 7357 if(!s->current_picture_ptr){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1548
diff
changeset
|
7358 av_log(h->s.avctx, AV_LOG_DEBUG, "error, NO frame\n"); |
| 1174 | 7359 return -1; |
| 7360 } | |
| 7361 | |
| 2409 | 7362 { |
|
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
|
7363 Picture *out = s->current_picture_ptr; |
| 2561 | 7364 #if 0 //decode order |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7365 *data_size = sizeof(AVFrame); |
| 2561 | 7366 #else |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7367 /* Sort B-frames into display order */ |
| 2409 | 7368 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
|
7369 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
|
7370 int out_idx = 0; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7371 int pics = 0; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7372 int out_of_order; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7373 int cross_idr = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7374 int dropped_frame = 0; |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7375 int i; |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7376 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7377 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
|
7378 && 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
|
7379 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
|
7380 s->low_delay = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7381 } |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7382 |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7383 while(h->delayed_pic[pics]) pics++; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7384 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
|
7385 if(cur->reference == 0) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7386 cur->reference = 1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7387 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7388 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
|
7389 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
|
7390 cross_idr = 1; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7391 |
|
2537
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7392 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
|
7393 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
|
7394 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
|
7395 out = h->delayed_pic[i]; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7396 out_idx = i; |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7397 } |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7398 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7399 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
|
7400 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
|
7401 out = prev; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7402 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
|
7403 || (s->low_delay && |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7404 ((!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
|
7405 || cur->pict_type == B_TYPE))) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7406 { |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7407 s->low_delay = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7408 s->avctx->has_b_frames++; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7409 out = prev; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7410 } |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7411 else if(out_of_order) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7412 out = prev; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7413 |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7414 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
|
7415 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
|
7416 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
|
7417 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
|
7418 } |
|
14fef0f3f532
H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents:
2536
diff
changeset
|
7419 |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7420 if(prev == out && !dropped_frame) |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7421 *data_size = 0; |
| 2561 | 7422 else |
| 7423 *data_size = sizeof(AVFrame); | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7424 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
|
7425 prev->reference = 0; |
|
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7426 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
|
7427 #endif |
| 2409 | 7428 |
| 7429 *pict= *(AVFrame*)out; | |
| 7430 } | |
| 7431 | |
|
2560
bfba825ee300
Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents:
2553
diff
changeset
|
7432 assert(pict->data[0]); |
|
1706
3ba5c493db6f
motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents:
1698
diff
changeset
|
7433 ff_print_debug_info(s, pict); |
| 1168 | 7434 //printf("out %d\n", (int)pict->data[0]); |
| 7435 #if 0 //? | |
| 7436 | |
| 7437 /* Return the Picture timestamp as the frame number */ | |
| 7438 /* we substract 1 because it is added on utils.c */ | |
| 7439 avctx->frame_number = s->picture_number - 1; | |
| 7440 #endif | |
| 7441 return get_consumed_bytes(s, buf_index, buf_size); | |
| 7442 } | |
| 7443 #if 0 | |
| 7444 static inline void fill_mb_avail(H264Context *h){ | |
| 7445 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
|
7446 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride; |
| 1168 | 7447 |
| 7448 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
|
7449 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
|
7450 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
|
7451 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num; |
| 1168 | 7452 }else{ |
| 7453 h->mb_avail[0]= | |
| 7454 h->mb_avail[1]= | |
| 7455 h->mb_avail[2]= 0; | |
| 7456 } | |
| 7457 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num; | |
| 7458 h->mb_avail[4]= 1; //FIXME move out | |
| 7459 h->mb_avail[5]= 0; //FIXME move out | |
| 7460 } | |
| 7461 #endif | |
| 7462 | |
| 7463 #if 0 //selftest | |
| 7464 #define COUNT 8000 | |
| 7465 #define SIZE (COUNT*40) | |
| 7466 int main(){ | |
| 7467 int i; | |
| 7468 uint8_t temp[SIZE]; | |
| 7469 PutBitContext pb; | |
| 7470 GetBitContext gb; | |
| 7471 // int int_temp[10000]; | |
| 7472 DSPContext dsp; | |
| 7473 AVCodecContext avctx; | |
| 7474 | |
| 7475 dsputil_init(&dsp, &avctx); | |
| 7476 | |
|
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1453
diff
changeset
|
7477 init_put_bits(&pb, temp, SIZE); |
| 1168 | 7478 printf("testing unsigned exp golomb\n"); |
| 7479 for(i=0; i<COUNT; i++){ | |
| 7480 START_TIMER | |
| 7481 set_ue_golomb(&pb, i); | |
| 7482 STOP_TIMER("set_ue_golomb"); | |
| 7483 } | |
| 7484 flush_put_bits(&pb); | |
| 7485 | |
| 7486 init_get_bits(&gb, temp, 8*SIZE); | |
| 7487 for(i=0; i<COUNT; i++){ | |
| 7488 int j, s; | |
| 7489 | |
| 7490 s= show_bits(&gb, 24); | |
| 7491 | |
| 7492 START_TIMER | |
| 7493 j= get_ue_golomb(&gb); | |
| 7494 if(j != i){ | |
| 7495 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
| 7496 // return -1; | |
| 7497 } | |
| 7498 STOP_TIMER("get_ue_golomb"); | |
| 7499 } | |
| 7500 | |
| 7501 | |
| 1524 | 7502 init_put_bits(&pb, temp, SIZE); |
| 1168 | 7503 printf("testing signed exp golomb\n"); |
| 7504 for(i=0; i<COUNT; i++){ | |
| 7505 START_TIMER | |
| 7506 set_se_golomb(&pb, i - COUNT/2); | |
| 7507 STOP_TIMER("set_se_golomb"); | |
| 7508 } | |
| 7509 flush_put_bits(&pb); | |
| 7510 | |
| 7511 init_get_bits(&gb, temp, 8*SIZE); | |
| 7512 for(i=0; i<COUNT; i++){ | |
| 7513 int j, s; | |
| 7514 | |
| 7515 s= show_bits(&gb, 24); | |
| 7516 | |
| 7517 START_TIMER | |
| 7518 j= get_se_golomb(&gb); | |
| 7519 if(j != i - COUNT/2){ | |
| 7520 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s); | |
| 7521 // return -1; | |
| 7522 } | |
| 7523 STOP_TIMER("get_se_golomb"); | |
| 7524 } | |
| 7525 | |
| 7526 printf("testing 4x4 (I)DCT\n"); | |
| 7527 | |
| 7528 DCTELEM block[16]; | |
| 7529 uint8_t src[16], ref[16]; | |
| 7530 uint64_t error= 0, max_error=0; | |
| 7531 | |
| 7532 for(i=0; i<COUNT; i++){ | |
| 7533 int j; | |
| 7534 // printf("%d %d %d\n", r1, r2, (r2-r1)*16); | |
| 7535 for(j=0; j<16; j++){ | |
| 7536 ref[j]= random()%255; | |
| 7537 src[j]= random()%255; | |
| 7538 } | |
| 7539 | |
| 7540 h264_diff_dct_c(block, src, ref, 4); | |
| 7541 | |
| 7542 //normalize | |
| 7543 for(j=0; j<16; j++){ | |
| 7544 // printf("%d ", block[j]); | |
| 7545 block[j]= block[j]*4; | |
| 7546 if(j&1) block[j]= (block[j]*4 + 2)/5; | |
| 7547 if(j&4) block[j]= (block[j]*4 + 2)/5; | |
| 7548 } | |
| 7549 // printf("\n"); | |
| 7550 | |
|
2272
cd43603c46f9
move h264 idct to its own file and call via function pointer in DspContext
michael
parents:
2255
diff
changeset
|
7551 s->dsp.h264_idct_add(ref, block, 4); |
| 1168 | 7552 /* for(j=0; j<16; j++){ |
| 7553 printf("%d ", ref[j]); | |
| 7554 } | |
| 7555 printf("\n");*/ | |
| 7556 | |
| 7557 for(j=0; j<16; j++){ | |
| 7558 int diff= ABS(src[j] - ref[j]); | |
| 7559 | |
| 7560 error+= diff*diff; | |
| 7561 max_error= FFMAX(max_error, diff); | |
| 7562 } | |
| 7563 } | |
| 7564 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error ); | |
| 7565 #if 0 | |
| 7566 printf("testing quantizer\n"); | |
| 7567 for(qp=0; qp<52; qp++){ | |
| 7568 for(i=0; i<16; i++) | |
| 7569 src1_block[i]= src2_block[i]= random()%255; | |
| 7570 | |
| 7571 } | |
| 7572 #endif | |
| 7573 printf("Testing NAL layer\n"); | |
| 7574 | |
| 7575 uint8_t bitstream[COUNT]; | |
| 7576 uint8_t nal[COUNT*2]; | |
| 7577 H264Context h; | |
| 7578 memset(&h, 0, sizeof(H264Context)); | |
| 7579 | |
| 7580 for(i=0; i<COUNT; i++){ | |
| 7581 int zeros= i; | |
| 7582 int nal_length; | |
| 7583 int consumed; | |
| 7584 int out_length; | |
| 7585 uint8_t *out; | |
| 7586 int j; | |
| 7587 | |
| 7588 for(j=0; j<COUNT; j++){ | |
| 7589 bitstream[j]= (random() % 255) + 1; | |
| 7590 } | |
| 7591 | |
| 7592 for(j=0; j<zeros; j++){ | |
| 7593 int pos= random() % COUNT; | |
| 7594 while(bitstream[pos] == 0){ | |
| 7595 pos++; | |
| 7596 pos %= COUNT; | |
| 7597 } | |
| 7598 bitstream[pos]=0; | |
| 7599 } | |
| 7600 | |
| 7601 START_TIMER | |
| 7602 | |
| 7603 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2); | |
| 7604 if(nal_length<0){ | |
| 7605 printf("encoding failed\n"); | |
| 7606 return -1; | |
| 7607 } | |
| 7608 | |
| 7609 out= decode_nal(&h, nal, &out_length, &consumed, nal_length); | |
| 7610 | |
| 7611 STOP_TIMER("NAL") | |
| 7612 | |
| 7613 if(out_length != COUNT){ | |
| 7614 printf("incorrect length %d %d\n", out_length, COUNT); | |
| 7615 return -1; | |
| 7616 } | |
| 7617 | |
| 7618 if(consumed != nal_length){ | |
| 7619 printf("incorrect consumed length %d %d\n", nal_length, consumed); | |
| 7620 return -1; | |
| 7621 } | |
| 7622 | |
| 7623 if(memcmp(bitstream, out, COUNT)){ | |
| 7624 printf("missmatch\n"); | |
| 7625 return -1; | |
| 7626 } | |
| 7627 } | |
| 7628 | |
| 7629 printf("Testing RBSP\n"); | |
| 7630 | |
| 7631 | |
| 7632 return 0; | |
| 7633 } | |
| 7634 #endif | |
| 7635 | |
| 7636 | |
| 7637 static int decode_end(AVCodecContext *avctx) | |
| 7638 { | |
| 7639 H264Context *h = avctx->priv_data; | |
| 7640 MpegEncContext *s = &h->s; | |
| 7641 | |
| 7642 free_tables(h); //FIXME cleanup init stuff perhaps | |
| 7643 MPV_common_end(s); | |
| 7644 | |
| 7645 // memset(h, 0, sizeof(H264Context)); | |
| 7646 | |
| 7647 return 0; | |
| 7648 } | |
| 7649 | |
| 7650 | |
| 7651 AVCodec h264_decoder = { | |
| 7652 "h264", | |
| 7653 CODEC_TYPE_VIDEO, | |
| 7654 CODEC_ID_H264, | |
| 7655 sizeof(H264Context), | |
| 7656 decode_init, | |
| 7657 NULL, | |
| 7658 decode_end, | |
| 7659 decode_frame, | |
| 2453 | 7660 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY, |
| 2640 | 7661 .flush= flush_dpb, |
| 1168 | 7662 }; |
| 7663 | |
| 1988 | 7664 AVCodecParser h264_parser = { |
| 7665 { CODEC_ID_H264 }, | |
| 2392 | 7666 sizeof(H264Context), |
| 1988 | 7667 NULL, |
| 7668 h264_parse, | |
| 7669 ff_parse_close, | |
| 7670 }; | |
| 7671 | |
| 1234 | 7672 #include "svq3.c" |
