Mercurial > libavcodec.hg
annotate h264.h @ 12107:1e4996a88ca5 libavcodec
aacdec: remove checks for impossible error conditions
author | mru |
---|---|
date | Wed, 07 Jul 2010 20:23:56 +0000 |
parents | 900b6c2523dc |
children |
rev | line source |
---|---|
4975 | 1 /* |
2 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder | |
3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> | |
4 * | |
5 * This file is part of FFmpeg. | |
6 * | |
7 * FFmpeg is free software; you can redistribute it and/or | |
8 * modify it under the terms of the GNU Lesser General Public | |
9 * License as published by the Free Software Foundation; either | |
10 * version 2.1 of the License, or (at your option) any later version. | |
11 * | |
12 * FFmpeg is distributed in the hope that it will be useful, | |
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Lesser General Public | |
18 * License along with FFmpeg; if not, write to the Free Software | |
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
20 */ | |
21 | |
22 /** | |
11644
7dd2a45249a9
Remove explicit filename from Doxygen @file commands.
diego
parents:
11627
diff
changeset
|
23 * @file |
4975 | 24 * H.264 / AVC / MPEG4 part10 codec. |
25 * @author Michael Niedermayer <michaelni@gmx.at> | |
26 */ | |
27 | |
7760 | 28 #ifndef AVCODEC_H264_H |
29 #define AVCODEC_H264_H | |
4975 | 30 |
11203 | 31 #include "libavutil/intreadwrite.h" |
4975 | 32 #include "dsputil.h" |
33 #include "cabac.h" | |
34 #include "mpegvideo.h" | |
11499 | 35 #include "h264dsp.h" |
5638
4a26dc4ca11d
Move H.264 intra prediction functions into their own context
kostya
parents:
5231
diff
changeset
|
36 #include "h264pred.h" |
10866 | 37 #include "rectangle.h" |
4975 | 38 |
39 #define interlaced_dct interlaced_dct_is_a_bad_name | |
5129 | 40 #define mb_intra mb_intra_is_not_initialized_see_mb_type |
4975 | 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 | |
7283
39e81fdd8d23
Move the size of the H264Context delayed_pic array into a #define.
astrange
parents:
7178
diff
changeset
|
57 #define MAX_DELAYED_PIC_COUNT 16 |
39e81fdd8d23
Move the size of the H264Context delayed_pic array into a #define.
astrange
parents:
7178
diff
changeset
|
58 |
4975 | 59 /* Compiling in interlaced support reduces the speed |
60 * of progressive decoding by about 2%. */ | |
61 #define ALLOW_INTERLACE | |
62 | |
7407 | 63 #define ALLOW_NOCHROMA |
64 | |
11282 | 65 #define FMO 0 |
66 | |
8079
2d3c7cd7d143
Replace literally hardcoded max slice number by named constant.
michael
parents:
8025
diff
changeset
|
67 /** |
2d3c7cd7d143
Replace literally hardcoded max slice number by named constant.
michael
parents:
8025
diff
changeset
|
68 * The maximum number of slices supported by the decoder. |
2d3c7cd7d143
Replace literally hardcoded max slice number by named constant.
michael
parents:
8025
diff
changeset
|
69 * must be a power of 2 |
2d3c7cd7d143
Replace literally hardcoded max slice number by named constant.
michael
parents:
8025
diff
changeset
|
70 */ |
2d3c7cd7d143
Replace literally hardcoded max slice number by named constant.
michael
parents:
8025
diff
changeset
|
71 #define MAX_SLICES 16 |
2d3c7cd7d143
Replace literally hardcoded max slice number by named constant.
michael
parents:
8025
diff
changeset
|
72 |
4975 | 73 #ifdef ALLOW_INTERLACE |
74 #define MB_MBAFF h->mb_mbaff | |
75 #define MB_FIELD h->mb_field_decoding_flag | |
76 #define FRAME_MBAFF h->mb_aff_frame | |
5801 | 77 #define FIELD_PICTURE (s->picture_structure != PICT_FRAME) |
4975 | 78 #else |
79 #define MB_MBAFF 0 | |
80 #define MB_FIELD 0 | |
81 #define FRAME_MBAFF 0 | |
5767 | 82 #define FIELD_PICTURE 0 |
4975 | 83 #undef IS_INTERLACED |
84 #define IS_INTERLACED(mb_type) 0 | |
85 #endif | |
5781
0b3aa6f4c313
Modifies macroblock addressing and current macroblock y-position for field decoding.
andoma
parents:
5772
diff
changeset
|
86 #define FIELD_OR_MBAFF_PICTURE (FRAME_MBAFF || FIELD_PICTURE) |
4975 | 87 |
7407 | 88 #ifdef ALLOW_NOCHROMA |
89 #define CHROMA h->sps.chroma_format_idc | |
90 #else | |
91 #define CHROMA 1 | |
92 #endif | |
93 | |
10893
2aafcafbe1f0
Replace cabac checks in inline functions from h264.h with constants.
michael
parents:
10883
diff
changeset
|
94 #ifndef CABAC |
2aafcafbe1f0
Replace cabac checks in inline functions from h264.h with constants.
michael
parents:
10883
diff
changeset
|
95 #define CABAC h->pps.cabac |
2aafcafbe1f0
Replace cabac checks in inline functions from h264.h with constants.
michael
parents:
10883
diff
changeset
|
96 #endif |
2aafcafbe1f0
Replace cabac checks in inline functions from h264.h with constants.
michael
parents:
10883
diff
changeset
|
97 |
7988
a7dfe657968d
Move nal unit types enum and EXTENDED_SAR #define from h264data.h to h264.h.
michael
parents:
7906
diff
changeset
|
98 #define EXTENDED_SAR 255 |
a7dfe657968d
Move nal unit types enum and EXTENDED_SAR #define from h264data.h to h264.h.
michael
parents:
7906
diff
changeset
|
99 |
8207
2f35f9781c31
Move #defines that are mostly used in h264.c out of h264data.h and into h264.h.
diego
parents:
8107
diff
changeset
|
100 #define MB_TYPE_REF0 MB_TYPE_ACPRED //dirty but it fits in 16 bit |
2f35f9781c31
Move #defines that are mostly used in h264.c out of h264data.h and into h264.h.
diego
parents:
8107
diff
changeset
|
101 #define MB_TYPE_8x8DCT 0x01000000 |
2f35f9781c31
Move #defines that are mostly used in h264.c out of h264data.h and into h264.h.
diego
parents:
8107
diff
changeset
|
102 #define IS_REF0(a) ((a) & MB_TYPE_REF0) |
2f35f9781c31
Move #defines that are mostly used in h264.c out of h264data.h and into h264.h.
diego
parents:
8107
diff
changeset
|
103 #define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT) |
2f35f9781c31
Move #defines that are mostly used in h264.c out of h264data.h and into h264.h.
diego
parents:
8107
diff
changeset
|
104 |
10862
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
105 /** |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
106 * Value of Picture.reference when Picture is not a reference picture, but |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
107 * is held for delayed output. |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
108 */ |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
109 #define DELAYED_PIC_REF 4 |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
110 |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
111 |
7988
a7dfe657968d
Move nal unit types enum and EXTENDED_SAR #define from h264data.h to h264.h.
michael
parents:
7906
diff
changeset
|
112 /* NAL unit types */ |
a7dfe657968d
Move nal unit types enum and EXTENDED_SAR #define from h264data.h to h264.h.
michael
parents:
7906
diff
changeset
|
113 enum { |
7990 | 114 NAL_SLICE=1, |
115 NAL_DPA, | |
116 NAL_DPB, | |
117 NAL_DPC, | |
118 NAL_IDR_SLICE, | |
119 NAL_SEI, | |
120 NAL_SPS, | |
121 NAL_PPS, | |
122 NAL_AUD, | |
123 NAL_END_SEQUENCE, | |
124 NAL_END_STREAM, | |
125 NAL_FILLER_DATA, | |
126 NAL_SPS_EXT, | |
127 NAL_AUXILIARY_SLICE=19 | |
7988
a7dfe657968d
Move nal unit types enum and EXTENDED_SAR #define from h264data.h to h264.h.
michael
parents:
7906
diff
changeset
|
128 }; |
a7dfe657968d
Move nal unit types enum and EXTENDED_SAR #define from h264data.h to h264.h.
michael
parents:
7906
diff
changeset
|
129 |
4975 | 130 /** |
8762
4f1567ce75c4
Replace hard-coded SEI type constants with symbolic names
superdump
parents:
8740
diff
changeset
|
131 * SEI message types |
4f1567ce75c4
Replace hard-coded SEI type constants with symbolic names
superdump
parents:
8740
diff
changeset
|
132 */ |
4f1567ce75c4
Replace hard-coded SEI type constants with symbolic names
superdump
parents:
8740
diff
changeset
|
133 typedef enum { |
8972 | 134 SEI_BUFFERING_PERIOD = 0, ///< buffering period (H.264, D.1.1) |
8762
4f1567ce75c4
Replace hard-coded SEI type constants with symbolic names
superdump
parents:
8740
diff
changeset
|
135 SEI_TYPE_PIC_TIMING = 1, ///< picture timing |
4f1567ce75c4
Replace hard-coded SEI type constants with symbolic names
superdump
parents:
8740
diff
changeset
|
136 SEI_TYPE_USER_DATA_UNREGISTERED = 5, ///< unregistered user data |
4f1567ce75c4
Replace hard-coded SEI type constants with symbolic names
superdump
parents:
8740
diff
changeset
|
137 SEI_TYPE_RECOVERY_POINT = 6 ///< recovery point (frame # to decoder sync) |
4f1567ce75c4
Replace hard-coded SEI type constants with symbolic names
superdump
parents:
8740
diff
changeset
|
138 } SEI_Type; |
4f1567ce75c4
Replace hard-coded SEI type constants with symbolic names
superdump
parents:
8740
diff
changeset
|
139 |
4f1567ce75c4
Replace hard-coded SEI type constants with symbolic names
superdump
parents:
8740
diff
changeset
|
140 /** |
8107
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
141 * pic_struct in picture timing SEI message |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
142 */ |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
143 typedef enum { |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
144 SEI_PIC_STRUCT_FRAME = 0, ///< 0: %frame |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
145 SEI_PIC_STRUCT_TOP_FIELD = 1, ///< 1: top field |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
146 SEI_PIC_STRUCT_BOTTOM_FIELD = 2, ///< 2: bottom field |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
147 SEI_PIC_STRUCT_TOP_BOTTOM = 3, ///< 3: top field, bottom field, in that order |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
148 SEI_PIC_STRUCT_BOTTOM_TOP = 4, ///< 4: bottom field, top field, in that order |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
149 SEI_PIC_STRUCT_TOP_BOTTOM_TOP = 5, ///< 5: top field, bottom field, top field repeated, in that order |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
150 SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM = 6, ///< 6: bottom field, top field, bottom field repeated, in that order |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
151 SEI_PIC_STRUCT_FRAME_DOUBLING = 7, ///< 7: %frame doubling |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
152 SEI_PIC_STRUCT_FRAME_TRIPLING = 8 ///< 8: %frame tripling |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
153 } SEI_PicStructType; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
154 |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
155 /** |
4975 | 156 * Sequence parameter set |
157 */ | |
158 typedef struct SPS{ | |
159 | |
160 int profile_idc; | |
161 int level_idc; | |
7407 | 162 int chroma_format_idc; |
4975 | 163 int transform_bypass; ///< qpprime_y_zero_transform_bypass_flag |
164 int log2_max_frame_num; ///< log2_max_frame_num_minus4 + 4 | |
165 int poc_type; ///< pic_order_cnt_type | |
166 int log2_max_poc_lsb; ///< log2_max_pic_order_cnt_lsb_minus4 | |
167 int delta_pic_order_always_zero_flag; | |
168 int offset_for_non_ref_pic; | |
169 int offset_for_top_to_bottom_field; | |
170 int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle | |
171 int ref_frame_count; ///< num_ref_frames | |
172 int gaps_in_frame_num_allowed_flag; | |
5755
b45894d869da
Cosmetic preparations for h264/PAFF implementation.
andoma
parents:
5642
diff
changeset
|
173 int mb_width; ///< pic_width_in_mbs_minus1 + 1 |
b45894d869da
Cosmetic preparations for h264/PAFF implementation.
andoma
parents:
5642
diff
changeset
|
174 int mb_height; ///< pic_height_in_map_units_minus1 + 1 |
4975 | 175 int frame_mbs_only_flag; |
176 int mb_aff; ///<mb_adaptive_frame_field_flag | |
177 int direct_8x8_inference_flag; | |
178 int crop; ///< frame_cropping_flag | |
6582
7d40da88f0c7
Crop parameters are unsigned, having them negative could be bad and lead
michael
parents:
6488
diff
changeset
|
179 unsigned int crop_left; ///< frame_cropping_rect_left_offset |
7d40da88f0c7
Crop parameters are unsigned, having them negative could be bad and lead
michael
parents:
6488
diff
changeset
|
180 unsigned int crop_right; ///< frame_cropping_rect_right_offset |
7d40da88f0c7
Crop parameters are unsigned, having them negative could be bad and lead
michael
parents:
6488
diff
changeset
|
181 unsigned int crop_top; ///< frame_cropping_rect_top_offset |
7d40da88f0c7
Crop parameters are unsigned, having them negative could be bad and lead
michael
parents:
6488
diff
changeset
|
182 unsigned int crop_bottom; ///< frame_cropping_rect_bottom_offset |
4975 | 183 int vui_parameters_present_flag; |
184 AVRational sar; | |
10837
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
185 int video_signal_type_present_flag; |
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
186 int full_range; |
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
187 int colour_description_present_flag; |
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
188 enum AVColorPrimaries color_primaries; |
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
189 enum AVColorTransferCharacteristic color_trc; |
e5905bfa625d
Export fullrange flag and color information for h.264
conrad
parents:
10829
diff
changeset
|
190 enum AVColorSpace colorspace; |
4975 | 191 int timing_info_present_flag; |
192 uint32_t num_units_in_tick; | |
193 uint32_t time_scale; | |
194 int fixed_frame_rate_flag; | |
195 short offset_for_ref_frame[256]; //FIXME dyn aloc? | |
196 int bitstream_restriction_flag; | |
197 int num_reorder_frames; | |
198 int scaling_matrix_present; | |
199 uint8_t scaling_matrix4[6][16]; | |
200 uint8_t scaling_matrix8[2][64]; | |
8107
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
201 int nal_hrd_parameters_present_flag; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
202 int vcl_hrd_parameters_present_flag; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
203 int pic_struct_present_flag; |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
204 int time_offset_length; |
8970 | 205 int cpb_cnt; ///< See H.264 E.1.2 |
8965 | 206 int initial_cpb_removal_delay_length; ///< initial_cpb_removal_delay_length_minus1 +1 |
8107
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
207 int cpb_removal_delay_length; ///< cpb_removal_delay_length_minus1 + 1 |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
208 int dpb_output_delay_length; ///< dpb_output_delay_length_minus1 + 1 |
8735
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8718
diff
changeset
|
209 int bit_depth_luma; ///< bit_depth_luma_minus8 + 8 |
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8718
diff
changeset
|
210 int bit_depth_chroma; ///< bit_depth_chroma_minus8 + 8 |
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8718
diff
changeset
|
211 int residual_color_transform_flag; ///< residual_colour_transform_flag |
4975 | 212 }SPS; |
213 | |
214 /** | |
215 * Picture parameter set | |
216 */ | |
217 typedef struct PPS{ | |
218 unsigned int sps_id; | |
219 int cabac; ///< entropy_coding_mode_flag | |
220 int pic_order_present; ///< pic_order_present_flag | |
221 int slice_group_count; ///< num_slice_groups_minus1 + 1 | |
222 int mb_slice_group_map_type; | |
223 unsigned int ref_count[2]; ///< num_ref_idx_l0/1_active_minus1 + 1 | |
224 int weighted_pred; ///< weighted_pred_flag | |
225 int weighted_bipred_idc; | |
226 int init_qp; ///< pic_init_qp_minus26 + 26 | |
227 int init_qs; ///< pic_init_qs_minus26 + 26 | |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
228 int chroma_qp_index_offset[2]; |
4975 | 229 int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag |
230 int constrained_intra_pred; ///< constrained_intra_pred_flag | |
231 int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag | |
232 int transform_8x8_mode; ///< transform_8x8_mode_flag | |
233 uint8_t scaling_matrix4[6][16]; | |
234 uint8_t scaling_matrix8[2][64]; | |
7347
612a78c3b128
qscale has a range of 0..51 we thus do not need a 256 entry table and neither need
michael
parents:
7343
diff
changeset
|
235 uint8_t chroma_qp_table[2][64]; ///< pre-scaled (with chroma_qp_index_offset) version of qp_table |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
236 int chroma_qp_diff; |
4975 | 237 }PPS; |
238 | |
239 /** | |
240 * Memory management control operation opcode. | |
241 */ | |
242 typedef enum MMCOOpcode{ | |
243 MMCO_END=0, | |
244 MMCO_SHORT2UNUSED, | |
245 MMCO_LONG2UNUSED, | |
246 MMCO_SHORT2LONG, | |
247 MMCO_SET_MAX_LONG, | |
248 MMCO_RESET, | |
249 MMCO_LONG, | |
250 } MMCOOpcode; | |
251 | |
252 /** | |
253 * Memory management control operation. | |
254 */ | |
255 typedef struct MMCO{ | |
256 MMCOOpcode opcode; | |
5756
db5a041fd77c
Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents:
5755
diff
changeset
|
257 int short_pic_num; ///< pic_num without wrapping (pic_num & max_pic_num) |
db5a041fd77c
Rename MMCO stuff to prepare for h264/PAFF implementation.
andoma
parents:
5755
diff
changeset
|
258 int long_arg; ///< index, pic_num, or num long refs depending on opcode |
4975 | 259 } MMCO; |
260 | |
261 /** | |
262 * H264Context | |
263 */ | |
264 typedef struct H264Context{ | |
265 MpegEncContext s; | |
11499 | 266 H264DSPContext h264dsp; |
5231
07a97575d0c4
Add support for streams with different chroma_qp_index_offset
gpoirier
parents:
5226
diff
changeset
|
267 int chroma_qp[2]; //QPc |
4975 | 268 |
10896
f112b4d030fa
Avoid wasting 4 cpu cycles per MB in redundantly calculating qp_thresh.
michael
parents:
10893
diff
changeset
|
269 int qp_thresh; ///< QP threshold to skip loopfilter |
f112b4d030fa
Avoid wasting 4 cpu cycles per MB in redundantly calculating qp_thresh.
michael
parents:
10893
diff
changeset
|
270 |
4975 | 271 int prev_mb_skipped; |
272 int next_mb_skipped; | |
273 | |
274 //prediction stuff | |
275 int chroma_pred_mode; | |
276 int intra16x16_pred_mode; | |
277 | |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
278 int topleft_mb_xy; |
4975 | 279 int top_mb_xy; |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
280 int topright_mb_xy; |
4975 | 281 int left_mb_xy[2]; |
282 | |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
283 int topleft_type; |
11012
b2fd83b26dd9
Set top & left types for deblock in fill_caches().
michael
parents:
11010
diff
changeset
|
284 int top_type; |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
285 int topright_type; |
11012
b2fd83b26dd9
Set top & left types for deblock in fill_caches().
michael
parents:
11010
diff
changeset
|
286 int left_type[2]; |
b2fd83b26dd9
Set top & left types for deblock in fill_caches().
michael
parents:
11010
diff
changeset
|
287 |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
288 const uint8_t * left_block; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
289 int topleft_partition; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
290 |
4975 | 291 int8_t intra4x4_pred_mode_cache[5*8]; |
11285 | 292 int8_t (*intra4x4_pred_mode); |
5638
4a26dc4ca11d
Move H.264 intra prediction functions into their own context
kostya
parents:
5231
diff
changeset
|
293 H264PredContext hpc; |
4975 | 294 unsigned int topleft_samples_available; |
295 unsigned int top_samples_available; | |
296 unsigned int topright_samples_available; | |
297 unsigned int left_samples_available; | |
298 uint8_t (*top_borders[2])[16+2*8]; | |
299 | |
300 /** | |
301 * non zero coeff count cache. | |
302 * is 64 if not available. | |
303 */ | |
11369 | 304 DECLARE_ALIGNED(8, uint8_t, non_zero_count_cache)[6*8]; |
10909
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
305 |
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
306 /* |
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
307 .UU.YYYY |
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
308 .UU.YYYY |
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
309 .vv.YYYY |
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
310 .VV.YYYY |
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
311 */ |
10906 | 312 uint8_t (*non_zero_count)[32]; |
4975 | 313 |
314 /** | |
315 * Motion vector cache. | |
316 */ | |
11369 | 317 DECLARE_ALIGNED(16, int16_t, mv_cache)[2][5*8][2]; |
318 DECLARE_ALIGNED(8, int8_t, ref_cache)[2][5*8]; | |
4975 | 319 #define LIST_NOT_USED -1 //FIXME rename? |
320 #define PART_NOT_AVAILABLE -2 | |
321 | |
322 /** | |
323 * is 1 if the specific list MV&references are set to 0,0,-2. | |
324 */ | |
325 int mv_cache_clean[2]; | |
326 | |
327 /** | |
328 * number of neighbors (top and/or left) that used 8x8 dct | |
329 */ | |
330 int neighbor_transform_size; | |
331 | |
332 /** | |
333 * block_offset[ 0..23] for frame macroblocks | |
334 * block_offset[24..47] for field macroblocks | |
335 */ | |
336 int block_offset[2*(16+8)]; | |
337 | |
338 uint32_t *mb2b_xy; //FIXME are these 4 a good idea? | |
11282 | 339 uint32_t *mb2br_xy; |
4975 | 340 int b_stride; //FIXME use s->b4_stride |
341 | |
342 int mb_linesize; ///< may be equal to s->linesize or s->linesize*2, for mbaff | |
343 int mb_uvlinesize; | |
344 | |
345 int emu_edge_width; | |
346 int emu_edge_height; | |
347 | |
348 SPS sps; ///< current sps | |
349 | |
350 /** | |
351 * current pps | |
352 */ | |
353 PPS pps; //FIXME move to Picture perhaps? (->no) do we need that? | |
354 | |
11348
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
355 uint32_t dequant4_buffer[6][52][16]; //FIXME should these be moved down? |
4975 | 356 uint32_t dequant8_buffer[2][52][64]; |
357 uint32_t (*dequant4_coeff[6])[16]; | |
358 uint32_t (*dequant8_coeff[2])[64]; | |
359 | |
360 int slice_num; | |
8079
2d3c7cd7d143
Replace literally hardcoded max slice number by named constant.
michael
parents:
8025
diff
changeset
|
361 uint16_t *slice_table; ///< slice_table_base + 2*mb_stride + 1 |
4975 | 362 int slice_type; |
7338 | 363 int slice_type_nos; ///< S free slice type (SI/SP are remapped to I/P) |
4975 | 364 int slice_type_fixed; |
365 | |
366 //interlacing specific flags | |
367 int mb_aff_frame; | |
368 int mb_field_decoding_flag; | |
369 int mb_mbaff; ///< mb_aff_frame && mb_field_decoding_flag | |
370 | |
11369 | 371 DECLARE_ALIGNED(8, uint16_t, sub_mb_type)[4]; |
4975 | 372 |
373 //Weighted pred stuff | |
374 int use_weight; | |
375 int use_weight_chroma; | |
376 int luma_log2_weight_denom; | |
377 int chroma_log2_weight_denom; | |
11344
65fe07cf9ee4
Note about luma/chroma_weight tables and their datatype.
michael
parents:
11341
diff
changeset
|
378 //The following 2 can be changed to int8_t but that causes 10cpu cycles speedloss |
11349 | 379 int luma_weight[48][2][2]; |
380 int chroma_weight[48][2][2][2]; | |
11558 | 381 int implicit_weight[48][48][2]; |
4975 | 382 |
383 int direct_spatial_mv_pred; | |
11096 | 384 int col_parity; |
385 int col_fieldoff; | |
4975 | 386 int dist_scale_factor[16]; |
7898
a33287a39a55
Make MBAFF temporal direct mode closer to the spec.
michael
parents:
7760
diff
changeset
|
387 int dist_scale_factor_field[2][32]; |
7906
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7898
diff
changeset
|
388 int map_col_to_list0[2][16+32]; |
5be944626072
Another try to fix temporal direct mode references.
michael
parents:
7898
diff
changeset
|
389 int map_col_to_list0_field[2][2][16+32]; |
4975 | 390 |
391 /** | |
392 * num_ref_idx_l0/1_active_minus1 + 1 | |
393 */ | |
394 unsigned int ref_count[2]; ///< counts frames or fields, depending on current mb mode | |
395 unsigned int list_count; | |
10906 | 396 uint8_t *list_counts; ///< Array of list_count per MB specifying the slice type |
5755
b45894d869da
Cosmetic preparations for h264/PAFF implementation.
andoma
parents:
5642
diff
changeset
|
397 Picture ref_list[2][48]; /**< 0..15: frame refs, 16..47: mbaff field refs. |
b45894d869da
Cosmetic preparations for h264/PAFF implementation.
andoma
parents:
5642
diff
changeset
|
398 Reordered version of default_ref_list |
b45894d869da
Cosmetic preparations for h264/PAFF implementation.
andoma
parents:
5642
diff
changeset
|
399 according to picture reordering in slice header */ |
8079
2d3c7cd7d143
Replace literally hardcoded max slice number by named constant.
michael
parents:
8025
diff
changeset
|
400 int ref2frm[MAX_SLICES][2][64]; ///< reference to frame number lists, used in the loop filter, the first 2 are for -2,-1 |
4975 | 401 |
402 //data partitioning | |
403 GetBitContext intra_gb; | |
404 GetBitContext inter_gb; | |
405 GetBitContext *intra_gb_ptr; | |
406 GetBitContext *inter_gb_ptr; | |
407 | |
11369 | 408 DECLARE_ALIGNED(16, DCTELEM, mb)[16*24]; |
6488 | 409 DCTELEM mb_padding[256]; ///< as mb is addressed by scantable[i] and scantable is uint8_t we can either check that i is not too large or ensure that there is some unused stuff after mb |
4975 | 410 |
411 /** | |
412 * Cabac | |
413 */ | |
414 CABACContext cabac; | |
415 uint8_t cabac_state[460]; | |
416 | |
417 /* 0x100 -> non null luma_dc, 0x80/0x40 -> non null chroma_dc (cb/cr), 0x?0 -> chroma_cbp(0,1,2), 0x0? luma_cbp */ | |
418 uint16_t *cbp_table; | |
419 int cbp; | |
420 int top_cbp; | |
421 int left_cbp; | |
422 /* chroma_pred_mode for i4x4 or i16x16, else 0 */ | |
423 uint8_t *chroma_pred_mode_table; | |
424 int last_qscale_diff; | |
11277
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
425 uint8_t (*mvd_table[2])[2]; |
11369 | 426 DECLARE_ALIGNED(16, uint8_t, mvd_cache)[2][5*8][2]; |
4975 | 427 uint8_t *direct_table; |
428 uint8_t direct_cache[5*8]; | |
429 | |
430 uint8_t zigzag_scan[16]; | |
431 uint8_t zigzag_scan8x8[64]; | |
432 uint8_t zigzag_scan8x8_cavlc[64]; | |
433 uint8_t field_scan[16]; | |
434 uint8_t field_scan8x8[64]; | |
435 uint8_t field_scan8x8_cavlc[64]; | |
436 const uint8_t *zigzag_scan_q0; | |
437 const uint8_t *zigzag_scan8x8_q0; | |
438 const uint8_t *zigzag_scan8x8_cavlc_q0; | |
439 const uint8_t *field_scan_q0; | |
440 const uint8_t *field_scan8x8_q0; | |
441 const uint8_t *field_scan8x8_cavlc_q0; | |
442 | |
443 int x264_build; | |
5642 | 444 |
11348
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
445 int mb_xy; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
446 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
447 int is_complex; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
448 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
449 //deblock |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
450 int deblocking_filter; ///< disable_deblocking_filter_idc with 1<->0 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
451 int slice_alpha_c0_offset; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
452 int slice_beta_offset; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
453 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
454 //============================================================= |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
455 //Things below are not used in the MB or more inner code |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
456 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
457 int nal_ref_idc; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
458 int nal_unit_type; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
459 uint8_t *rbsp_buffer[2]; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
460 unsigned int rbsp_buffer_size[2]; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
461 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
462 /** |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
463 * Used to parse AVC variant of h264 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
464 */ |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
465 int is_avc; ///< this flag is != 0 if codec is avc1 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
466 int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) |
11791
51abd780bda6
Cleanup prev commit, flag variable should start with 0
hyc
parents:
11790
diff
changeset
|
467 int got_first; ///< this flag is != 0 if we've parsed a frame |
11348
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
468 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
469 SPS *sps_buffers[MAX_SPS_COUNT]; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
470 PPS *pps_buffers[MAX_PPS_COUNT]; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
471 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
472 int dequant_coeff_pps; ///< reinit tables when pps changes |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
473 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
474 uint16_t *slice_table_base; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
475 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
476 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
477 //POC stuff |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
478 int poc_lsb; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
479 int poc_msb; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
480 int delta_poc_bottom; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
481 int delta_poc[2]; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
482 int frame_num; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
483 int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
484 int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
485 int frame_num_offset; ///< for POC type 2 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
486 int prev_frame_num_offset; ///< for POC type 2 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
487 int prev_frame_num; ///< frame_num of the last pic for POC type 1/2 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
488 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
489 /** |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
490 * frame_num for frames or 2*frame_num+1 for field pics. |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
491 */ |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
492 int curr_pic_num; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
493 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
494 /** |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
495 * max_frame_num or 2*max_frame_num for field pics. |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
496 */ |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
497 int max_pic_num; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
498 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
499 int redundant_pic_count; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
500 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
501 Picture *short_ref[32]; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
502 Picture *long_ref[32]; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
503 Picture default_ref_list[2][32]; ///< base reference list for all slices of a coded picture |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
504 Picture *delayed_pic[MAX_DELAYED_PIC_COUNT+2]; //FIXME size? |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
505 int outputed_poc; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
506 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
507 /** |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
508 * memory management control operations buffer. |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
509 */ |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
510 MMCO mmco[MAX_MMCO_COUNT]; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
511 int mmco_index; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
512 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
513 int long_ref_count; ///< number of actual long term references |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
514 int short_ref_count; ///< number of actual short term references |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
515 |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
516 int cabac_init_idc; |
3c624d573966
Move all context fields that are not used in the mb and block layers
michael
parents:
11346
diff
changeset
|
517 |
5642 | 518 /** |
519 * @defgroup multithreading Members for slice based multithreading | |
520 * @{ | |
521 */ | |
522 struct H264Context *thread_context[MAX_THREADS]; | |
523 | |
524 /** | |
525 * current slice number, used to initalize slice_num of each thread/context | |
526 */ | |
527 int current_slice; | |
528 | |
529 /** | |
530 * Max number of threads / contexts. | |
531 * This is equal to AVCodecContext.thread_count unless | |
532 * multithreaded decoding is impossible, in which case it is | |
533 * reduced to 1. | |
534 */ | |
535 int max_contexts; | |
536 | |
537 /** | |
538 * 1 if the single thread fallback warning has already been | |
539 * displayed, 0 otherwise. | |
540 */ | |
541 int single_decode_warning; | |
542 | |
543 int last_slice_type; | |
544 /** @} */ | |
545 | |
8107
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
546 /** |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
547 * pic_struct in picture timing SEI message |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
548 */ |
e61f76efc9f3
h264: Implement decoding of picture timing SEI message.
andoma
parents:
8079
diff
changeset
|
549 SEI_PicStructType sei_pic_struct; |
8353
add1a0d65370
Do not recalculate constant part of is_complex for every MB.
michael
parents:
8207
diff
changeset
|
550 |
8783
e91ea98d868a
Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents:
8762
diff
changeset
|
551 /** |
9831
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9384
diff
changeset
|
552 * Complement sei_pic_struct |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9384
diff
changeset
|
553 * SEI_PIC_STRUCT_TOP_BOTTOM and SEI_PIC_STRUCT_BOTTOM_TOP indicate interlaced frames. |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9384
diff
changeset
|
554 * However, soft telecined frames may have these values. |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9384
diff
changeset
|
555 * This is used in an attempt to flag soft telecine progressive. |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9384
diff
changeset
|
556 */ |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9384
diff
changeset
|
557 int prev_interlaced_frame; |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9384
diff
changeset
|
558 |
febe1855b64a
Add field prev_interlaced_frame to H264Context to be able to flag soft telecine
cehoyos
parents:
9384
diff
changeset
|
559 /** |
9128
793cf8c68c4f
Add support for ct_type to correctly detect interlaced flag
schreter
parents:
9071
diff
changeset
|
560 * Bit set of clock types for fields/frames in picture timing SEI message. |
793cf8c68c4f
Add support for ct_type to correctly detect interlaced flag
schreter
parents:
9071
diff
changeset
|
561 * For each found ct_type, appropriate bit is set (e.g., bit 1 for |
793cf8c68c4f
Add support for ct_type to correctly detect interlaced flag
schreter
parents:
9071
diff
changeset
|
562 * interlaced). |
793cf8c68c4f
Add support for ct_type to correctly detect interlaced flag
schreter
parents:
9071
diff
changeset
|
563 */ |
793cf8c68c4f
Add support for ct_type to correctly detect interlaced flag
schreter
parents:
9071
diff
changeset
|
564 int sei_ct_type; |
793cf8c68c4f
Add support for ct_type to correctly detect interlaced flag
schreter
parents:
9071
diff
changeset
|
565 |
793cf8c68c4f
Add support for ct_type to correctly detect interlaced flag
schreter
parents:
9071
diff
changeset
|
566 /** |
8966 | 567 * dpb_output_delay in picture timing SEI message, see H.264 C.2.2 |
568 */ | |
569 int sei_dpb_output_delay; | |
570 | |
571 /** | |
8967 | 572 * cpb_removal_delay in picture timing SEI message, see H.264 C.1.2 |
573 */ | |
574 int sei_cpb_removal_delay; | |
575 | |
576 /** | |
8783
e91ea98d868a
Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents:
8762
diff
changeset
|
577 * recovery_frame_cnt from SEI message |
e91ea98d868a
Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents:
8762
diff
changeset
|
578 * |
e91ea98d868a
Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents:
8762
diff
changeset
|
579 * Set to -1 if no recovery point SEI message found or to number of frames |
e91ea98d868a
Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents:
8762
diff
changeset
|
580 * before playback synchronizes. Frames having recovery point are key |
e91ea98d868a
Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents:
8762
diff
changeset
|
581 * frames. |
e91ea98d868a
Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents:
8762
diff
changeset
|
582 */ |
e91ea98d868a
Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents:
8762
diff
changeset
|
583 int sei_recovery_frame_cnt; |
e91ea98d868a
Add SEI recovery point frame counter to H264Context and use it when
cehoyos
parents:
8762
diff
changeset
|
584 |
8735
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8718
diff
changeset
|
585 int luma_weight_flag[2]; ///< 7.4.3.2 luma_weight_lX_flag |
5d7ebbb7e91b
Add fields to H264Context and SPS for upcoming VA API support.
cehoyos
parents:
8718
diff
changeset
|
586 int chroma_weight_flag[2]; ///< 7.4.3.2 chroma_weight_lX_flag |
8972 | 587 |
588 // Timestamp stuff | |
589 int sei_buffering_period_present; ///< Buffering period SEI flag | |
590 int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs | |
11341
a26f51d0bb63
move svq3 specific fields to the end of the context
michael
parents:
11339
diff
changeset
|
591 |
a26f51d0bb63
move svq3 specific fields to the end of the context
michael
parents:
11339
diff
changeset
|
592 //SVQ3 specific fields |
a26f51d0bb63
move svq3 specific fields to the end of the context
michael
parents:
11339
diff
changeset
|
593 int halfpel_flag; |
a26f51d0bb63
move svq3 specific fields to the end of the context
michael
parents:
11339
diff
changeset
|
594 int thirdpel_flag; |
a26f51d0bb63
move svq3 specific fields to the end of the context
michael
parents:
11339
diff
changeset
|
595 int unknown_svq3_flag; |
a26f51d0bb63
move svq3 specific fields to the end of the context
michael
parents:
11339
diff
changeset
|
596 int next_slice_index; |
a26f51d0bb63
move svq3 specific fields to the end of the context
michael
parents:
11339
diff
changeset
|
597 uint32_t svq3_watermark_key; |
4975 | 598 }H264Context; |
599 | |
10859
762e6bb0ba40
Split (picture|seq) parameter set decoding out of h264.c.
michael
parents:
10858
diff
changeset
|
600 |
762e6bb0ba40
Split (picture|seq) parameter set decoding out of h264.c.
michael
parents:
10858
diff
changeset
|
601 extern const uint8_t ff_h264_chroma_qp[52]; |
762e6bb0ba40
Split (picture|seq) parameter set decoding out of h264.c.
michael
parents:
10858
diff
changeset
|
602 |
11031 | 603 void ff_svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); |
604 | |
605 void ff_svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc); | |
10859
762e6bb0ba40
Split (picture|seq) parameter set decoding out of h264.c.
michael
parents:
10858
diff
changeset
|
606 |
8996
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
607 /** |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
608 * Decode SEI |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
609 */ |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
610 int ff_h264_decode_sei(H264Context *h); |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
611 |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
612 /** |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
613 * Decode SPS |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
614 */ |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
615 int ff_h264_decode_seq_parameter_set(H264Context *h); |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
616 |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
617 /** |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
618 * Decode PPS |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
619 */ |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
620 int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length); |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
621 |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
622 /** |
12024 | 623 * Decode a network abstraction layer unit. |
8996
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
624 * @param consumed is the number of bytes used as input |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
625 * @param length is the length of the array |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
626 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing? |
11556 | 627 * @return decoded bytes, might be src+1 if no escapes |
8996
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
628 */ |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
629 const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, int *dst_length, int *consumed, int length); |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
630 |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
631 /** |
12024 | 632 * Identify the exact end of the bitstream |
8996
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
633 * @return the length of the trailing, or 0 if damaged |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
634 */ |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
635 int ff_h264_decode_rbsp_trailing(H264Context *h, const uint8_t *src); |
e65778184ded
Make the following H264 functions available to the parser:
cehoyos
parents:
8972
diff
changeset
|
636 |
9380
54e650136c87
Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents:
9128
diff
changeset
|
637 /** |
12024 | 638 * Free any data that may have been allocated in the H264 context like SPS, PPS etc. |
9380
54e650136c87
Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents:
9128
diff
changeset
|
639 */ |
9384
828d15d322ed
Add forgotten void return type to ff_h264_free_context
reimar
parents:
9380
diff
changeset
|
640 av_cold void ff_h264_free_context(H264Context *h); |
9380
54e650136c87
Add a ff_h264_free_context function and call it from the H.264 parser.
reimar
parents:
9128
diff
changeset
|
641 |
10829
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
9831
diff
changeset
|
642 /** |
12024 | 643 * Reconstruct bitstream slice_type. |
10829
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
9831
diff
changeset
|
644 */ |
10987
85de0c8a19b7
Added a missing const to ff_h264_get_slice_type().
fenrir
parents:
10985
diff
changeset
|
645 int ff_h264_get_slice_type(const H264Context *h); |
10829
46a247e54d6e
Export get_slice_type() as ff_h264_get_slice_type().
ramiro
parents:
9831
diff
changeset
|
646 |
10852 | 647 /** |
12024 | 648 * Allocate tables. |
10852 | 649 * needs width/height |
650 */ | |
651 int ff_h264_alloc_tables(H264Context *h); | |
652 | |
653 /** | |
12024 | 654 * Fill the default_ref_list. |
10862
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
655 */ |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
656 int ff_h264_fill_default_ref_list(H264Context *h); |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
657 |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
658 int ff_h264_decode_ref_pic_list_reordering(H264Context *h); |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
659 void ff_h264_fill_mbaff_ref_list(H264Context *h); |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
660 void ff_h264_remove_all_refs(H264Context *h); |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
661 |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
662 /** |
12024 | 663 * Execute the reference picture marking (memory management control operations). |
10862
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
664 */ |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
665 int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count); |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
666 |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
667 int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb); |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
668 |
12093
05f91a88f986
Factorize ff_generate_sliding_window_mmcos() out.
michael
parents:
12024
diff
changeset
|
669 void ff_generate_sliding_window_mmcos(H264Context *h); |
05f91a88f986
Factorize ff_generate_sliding_window_mmcos() out.
michael
parents:
12024
diff
changeset
|
670 |
10862
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
671 |
d9c084a0c22b
Split all the reference picture handling off h264.c.
michael
parents:
10859
diff
changeset
|
672 /** |
12024 | 673 * Check if the top & left blocks are available if needed & change the dc mode so it only uses the available blocks. |
10852 | 674 */ |
10863
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
675 int ff_h264_check_intra4x4_pred_mode(H264Context *h); |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
676 |
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
677 /** |
12024 | 678 * Check if the top & left blocks are available if needed & change the dc mode so it only uses the available blocks. |
10863
974ac220c93a
Move check_intra4x4_pred_mode() back from h264.h to h264.c, the function is just
michael
parents:
10862
diff
changeset
|
679 */ |
10852 | 680 int ff_h264_check_intra_pred_mode(H264Context *h, int mode); |
681 | |
682 void ff_h264_write_back_intra_pred_mode(H264Context *h); | |
683 void ff_h264_hl_decode_mb(H264Context *h); | |
684 int ff_h264_frame_start(H264Context *h); | |
11777 | 685 int ff_h264_decode_extradata(H264Context *h); |
10852 | 686 av_cold int ff_h264_decode_init(AVCodecContext *avctx); |
687 av_cold int ff_h264_decode_end(AVCodecContext *avctx); | |
10866 | 688 av_cold void ff_h264_decode_init_vlc(void); |
689 | |
690 /** | |
12024 | 691 * Decode a macroblock |
11556 | 692 * @return 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed |
10866 | 693 */ |
694 int ff_h264_decode_mb_cavlc(H264Context *h); | |
10852 | 695 |
10869 | 696 /** |
12024 | 697 * Decode a CABAC coded macroblock |
11556 | 698 * @return 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed |
10869 | 699 */ |
700 int ff_h264_decode_mb_cabac(H264Context *h); | |
701 | |
702 void ff_h264_init_cabac_states(H264Context *h); | |
703 | |
10857
b20434143fd5
Split direct mode (macro)block decoding off h264.c.
michael
parents:
10854
diff
changeset
|
704 void ff_h264_direct_dist_scale_factor(H264Context * const h); |
b20434143fd5
Split direct mode (macro)block decoding off h264.c.
michael
parents:
10854
diff
changeset
|
705 void ff_h264_direct_ref_list_init(H264Context * const h); |
b20434143fd5
Split direct mode (macro)block decoding off h264.c.
michael
parents:
10854
diff
changeset
|
706 void ff_h264_pred_direct_motion(H264Context * const h, int *mb_type); |
b20434143fd5
Split direct mode (macro)block decoding off h264.c.
michael
parents:
10854
diff
changeset
|
707 |
10854 | 708 void ff_h264_filter_mb_fast( 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); |
709 void ff_h264_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); | |
710 | |
10858 | 711 /** |
712 * Reset SEI values at the beginning of the frame. | |
713 * | |
714 * @param h H.264 context. | |
715 */ | |
716 void ff_h264_reset_sei(H264Context *h); | |
717 | |
718 | |
10852 | 719 /* |
720 o-o o-o | |
721 / / / | |
722 o-o o-o | |
723 ,---' | |
724 o-o o-o | |
725 / / / | |
726 o-o o-o | |
727 */ | |
728 //This table must be here because scan8[constant] must be known at compiletime | |
729 static const uint8_t scan8[16 + 2*4]={ | |
730 4+1*8, 5+1*8, 4+2*8, 5+2*8, | |
731 6+1*8, 7+1*8, 6+2*8, 7+2*8, | |
732 4+3*8, 5+3*8, 4+4*8, 5+4*8, | |
733 6+3*8, 7+3*8, 6+4*8, 7+4*8, | |
734 1+1*8, 2+1*8, | |
735 1+2*8, 2+2*8, | |
736 1+4*8, 2+4*8, | |
737 1+5*8, 2+5*8, | |
738 }; | |
739 | |
740 static av_always_inline uint32_t pack16to32(int a, int b){ | |
741 #if HAVE_BIGENDIAN | |
742 return (b&0xFFFF) + (a<<16); | |
743 #else | |
744 return (a&0xFFFF) + (b<<16); | |
745 #endif | |
746 } | |
747 | |
11277
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
748 static av_always_inline uint16_t pack8to16(int a, int b){ |
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
749 #if HAVE_BIGENDIAN |
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
750 return (b&0xFF) + (a<<8); |
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
751 #else |
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
752 return (a&0xFF) + (b<<8); |
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
753 #endif |
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
754 } |
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
755 |
10852 | 756 /** |
10854 | 757 * gets the chroma qp. |
758 */ | |
759 static inline int get_chroma_qp(H264Context *h, int t, int qscale){ | |
760 return h->pps.chroma_qp_table[t][qscale]; | |
761 } | |
762 | |
10866 | 763 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my); |
764 | |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
765 static void fill_decode_neighbors(H264Context *h, int mb_type){ |
10866 | 766 MpegEncContext * const s = &h->s; |
767 const int mb_xy= h->mb_xy; | |
768 int topleft_xy, top_xy, topright_xy, left_xy[2]; | |
10909
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
769 static const uint8_t left_block_options[4][16]={ |
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
770 {0,1,2,3,7,10,8,11,7+0*8, 7+1*8, 7+2*8, 7+3*8, 2+0*8, 2+3*8, 2+1*8, 2+2*8}, |
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
771 {2,2,3,3,8,11,8,11,7+2*8, 7+2*8, 7+3*8, 7+3*8, 2+1*8, 2+2*8, 2+1*8, 2+2*8}, |
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
772 {0,0,1,1,7,10,7,10,7+0*8, 7+0*8, 7+1*8, 7+1*8, 2+0*8, 2+3*8, 2+0*8, 2+3*8}, |
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
773 {0,2,0,2,7,10,7,10,7+0*8, 7+2*8, 7+0*8, 7+2*8, 2+0*8, 2+3*8, 2+0*8, 2+3*8} |
10866 | 774 }; |
775 | |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
776 h->topleft_partition= -1; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
777 |
11008
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
778 top_xy = mb_xy - (s->mb_stride << MB_FIELD); |
10866 | 779 |
780 /* Wow, what a mess, why didn't they simplify the interlacing & intra | |
781 * stuff, I can't imagine that these complex rules are worth it. */ | |
782 | |
783 topleft_xy = top_xy - 1; | |
784 topright_xy= top_xy + 1; | |
785 left_xy[1] = left_xy[0] = mb_xy-1; | |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
786 h->left_block = left_block_options[0]; |
10866 | 787 if(FRAME_MBAFF){ |
11008
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
788 const int left_mb_field_flag = IS_INTERLACED(s->current_picture.mb_type[mb_xy-1]); |
10866 | 789 const int curr_mb_field_flag = IS_INTERLACED(mb_type); |
11008
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
790 if(s->mb_y&1){ |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
791 if (left_mb_field_flag != curr_mb_field_flag) { |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
792 left_xy[1] = left_xy[0] = mb_xy - s->mb_stride - 1; |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
793 if (curr_mb_field_flag) { |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
794 left_xy[1] += s->mb_stride; |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
795 h->left_block = left_block_options[3]; |
11008
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
796 } else { |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
797 topleft_xy += s->mb_stride; |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
798 // take top left mv from the middle of the mb, as opposed to all other modes which use the bottom right partition |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
799 h->topleft_partition = 0; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
800 h->left_block = left_block_options[1]; |
11008
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
801 } |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
802 } |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
803 }else{ |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
804 if(curr_mb_field_flag){ |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
805 topleft_xy += s->mb_stride & (((s->current_picture.mb_type[top_xy - 1]>>7)&1)-1); |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
806 topright_xy += s->mb_stride & (((s->current_picture.mb_type[top_xy + 1]>>7)&1)-1); |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
807 top_xy += s->mb_stride & (((s->current_picture.mb_type[top_xy ]>>7)&1)-1); |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
808 } |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
809 if (left_mb_field_flag != curr_mb_field_flag) { |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
810 if (curr_mb_field_flag) { |
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
811 left_xy[1] += s->mb_stride; |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
812 h->left_block = left_block_options[3]; |
11008
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
813 } else { |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
814 h->left_block = left_block_options[2]; |
11008
ec192d9ebac5
Optimize mb neighbor initialization for MBAFF in fill_caches().
michael
parents:
11002
diff
changeset
|
815 } |
10866 | 816 } |
817 } | |
818 } | |
819 | |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
820 h->topleft_mb_xy = topleft_xy; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
821 h->top_mb_xy = top_xy; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
822 h->topright_mb_xy= topright_xy; |
10866 | 823 h->left_mb_xy[0] = left_xy[0]; |
824 h->left_mb_xy[1] = left_xy[1]; | |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
825 //FIXME do we need all in the context? |
11306 | 826 |
827 h->topleft_type = s->current_picture.mb_type[topleft_xy] ; | |
828 h->top_type = s->current_picture.mb_type[top_xy] ; | |
829 h->topright_type= s->current_picture.mb_type[topright_xy]; | |
830 h->left_type[0] = s->current_picture.mb_type[left_xy[0]] ; | |
831 h->left_type[1] = s->current_picture.mb_type[left_xy[1]] ; | |
832 | |
11354 | 833 if(FMO){ |
11306 | 834 if(h->slice_table[topleft_xy ] != h->slice_num) h->topleft_type = 0; |
835 if(h->slice_table[top_xy ] != h->slice_num) h->top_type = 0; | |
11354 | 836 if(h->slice_table[left_xy[0] ] != h->slice_num) h->left_type[0] = h->left_type[1] = 0; |
837 }else{ | |
838 if(h->slice_table[topleft_xy ] != h->slice_num){ | |
839 h->topleft_type = 0; | |
840 if(h->slice_table[top_xy ] != h->slice_num) h->top_type = 0; | |
841 if(h->slice_table[left_xy[0] ] != h->slice_num) h->left_type[0] = h->left_type[1] = 0; | |
842 } | |
843 } | |
11306 | 844 if(h->slice_table[topright_xy] != h->slice_num) h->topright_type= 0; |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
845 } |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
846 |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
847 static void fill_decode_caches(H264Context *h, int mb_type){ |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
848 MpegEncContext * const s = &h->s; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
849 int topleft_xy, top_xy, topright_xy, left_xy[2]; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
850 int topleft_type, top_type, topright_type, left_type[2]; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
851 const uint8_t * left_block= h->left_block; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
852 int i; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
853 |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
854 topleft_xy = h->topleft_mb_xy ; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
855 top_xy = h->top_mb_xy ; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
856 topright_xy = h->topright_mb_xy; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
857 left_xy[0] = h->left_mb_xy[0] ; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
858 left_xy[1] = h->left_mb_xy[1] ; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
859 topleft_type = h->topleft_type ; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
860 top_type = h->top_type ; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
861 topright_type= h->topright_type ; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
862 left_type[0] = h->left_type[0] ; |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
863 left_type[1] = h->left_type[1] ; |
10866 | 864 |
11158
81c3f88f460f
Skiped MBs dont need the cbp stuff so skip initing that.
michael
parents:
11156
diff
changeset
|
865 if(!IS_SKIP(mb_type)){ |
10928 | 866 if(IS_INTRA(mb_type)){ |
867 int type_mask= h->pps.constrained_intra_pred ? IS_INTRA(-1) : -1; | |
868 h->topleft_samples_available= | |
869 h->top_samples_available= | |
870 h->left_samples_available= 0xFFFF; | |
871 h->topright_samples_available= 0xEEEA; | |
10866 | 872 |
10928 | 873 if(!(top_type & type_mask)){ |
874 h->topleft_samples_available= 0xB3FF; | |
875 h->top_samples_available= 0x33FF; | |
876 h->topright_samples_available= 0x26EA; | |
877 } | |
878 if(IS_INTERLACED(mb_type) != IS_INTERLACED(left_type[0])){ | |
879 if(IS_INTERLACED(mb_type)){ | |
880 if(!(left_type[0] & type_mask)){ | |
881 h->topleft_samples_available&= 0xDFFF; | |
882 h->left_samples_available&= 0x5FFF; | |
883 } | |
884 if(!(left_type[1] & type_mask)){ | |
885 h->topleft_samples_available&= 0xFF5F; | |
886 h->left_samples_available&= 0xFF5F; | |
887 } | |
888 }else{ | |
11296
4709312b48d5
Remove useless check of the 2 left MBs of a pair being in the same slice.
michael
parents:
11294
diff
changeset
|
889 int left_typei = s->current_picture.mb_type[left_xy[0] + s->mb_stride]; |
4709312b48d5
Remove useless check of the 2 left MBs of a pair being in the same slice.
michael
parents:
11294
diff
changeset
|
890 |
10928 | 891 assert(left_xy[0] == left_xy[1]); |
892 if(!((left_typei & type_mask) && (left_type[0] & type_mask))){ | |
893 h->topleft_samples_available&= 0xDF5F; | |
894 h->left_samples_available&= 0x5F5F; | |
895 } | |
10866 | 896 } |
897 }else{ | |
10928 | 898 if(!(left_type[0] & type_mask)){ |
10866 | 899 h->topleft_samples_available&= 0xDF5F; |
900 h->left_samples_available&= 0x5F5F; | |
901 } | |
902 } | |
903 | |
10928 | 904 if(!(topleft_type & type_mask)) |
905 h->topleft_samples_available&= 0x7FFF; | |
10866 | 906 |
10928 | 907 if(!(topright_type & type_mask)) |
908 h->topright_samples_available&= 0xFBFF; | |
10866 | 909 |
10928 | 910 if(IS_INTRA4x4(mb_type)){ |
911 if(IS_INTRA4x4(top_type)){ | |
11286
db94c9bc5694
Reorder intra4x4_pred_mode so that we can read/write 4 values at once.
michael
parents:
11285
diff
changeset
|
912 AV_COPY32(h->intra4x4_pred_mode_cache+4+8*0, h->intra4x4_pred_mode + h->mb2br_xy[top_xy]); |
10866 | 913 }else{ |
10928 | 914 h->intra4x4_pred_mode_cache[4+8*0]= |
915 h->intra4x4_pred_mode_cache[5+8*0]= | |
916 h->intra4x4_pred_mode_cache[6+8*0]= | |
11287 | 917 h->intra4x4_pred_mode_cache[7+8*0]= 2 - 3*!(top_type & type_mask); |
10928 | 918 } |
919 for(i=0; i<2; i++){ | |
920 if(IS_INTRA4x4(left_type[i])){ | |
11285 | 921 int8_t *mode= h->intra4x4_pred_mode + h->mb2br_xy[left_xy[i]]; |
11286
db94c9bc5694
Reorder intra4x4_pred_mode so that we can read/write 4 values at once.
michael
parents:
11285
diff
changeset
|
922 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= mode[6-left_block[0+2*i]]; |
db94c9bc5694
Reorder intra4x4_pred_mode so that we can read/write 4 values at once.
michael
parents:
11285
diff
changeset
|
923 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= mode[6-left_block[1+2*i]]; |
10928 | 924 }else{ |
925 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= | |
11287 | 926 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= 2 - 3*!(left_type[i] & type_mask); |
10928 | 927 } |
10866 | 928 } |
929 } | |
930 } | |
931 | |
932 | |
933 /* | |
934 0 . T T. T T T T | |
935 1 L . .L . . . . | |
936 2 L . .L . . . . | |
937 3 . T TL . . . . | |
938 4 L . .L . . . . | |
939 5 L . .. . . . . | |
940 */ | |
941 //FIXME constraint_intra_pred & partitioning & nnz (let us hope this is just a typo in the spec) | |
942 if(top_type){ | |
11203 | 943 AV_COPY32(&h->non_zero_count_cache[4+8*0], &h->non_zero_count[top_xy][4+3*8]); |
10928 | 944 h->non_zero_count_cache[1+8*0]= h->non_zero_count[top_xy][1+1*8]; |
945 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][2+1*8]; | |
10866 | 946 |
10928 | 947 h->non_zero_count_cache[1+8*3]= h->non_zero_count[top_xy][1+2*8]; |
948 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][2+2*8]; | |
11022
44529d4292ce
Split fill_caches() between loopfilter & decode, the 2 no longer where common
michael
parents:
11020
diff
changeset
|
949 }else { |
10928 | 950 h->non_zero_count_cache[1+8*0]= |
951 h->non_zero_count_cache[2+8*0]= | |
10866 | 952 |
10928 | 953 h->non_zero_count_cache[1+8*3]= |
954 h->non_zero_count_cache[2+8*3]= | |
11203 | 955 AV_WN32A(&h->non_zero_count_cache[4+8*0], CABAC && !IS_INTRA(mb_type) ? 0 : 0x40404040); |
10866 | 956 } |
957 | |
958 for (i=0; i<2; i++) { | |
959 if(left_type[i]){ | |
10909
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
960 h->non_zero_count_cache[3+8*1 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[8+0+2*i]]; |
f4cf3960b8c6
Reorganize how values are stored in h->non_zero_count.
michael
parents:
10908
diff
changeset
|
961 h->non_zero_count_cache[3+8*2 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[8+1+2*i]]; |
10928 | 962 h->non_zero_count_cache[0+8*1 + 8*i]= h->non_zero_count[left_xy[i]][left_block[8+4+2*i]]; |
963 h->non_zero_count_cache[0+8*4 + 8*i]= h->non_zero_count[left_xy[i]][left_block[8+5+2*i]]; | |
11022
44529d4292ce
Split fill_caches() between loopfilter & decode, the 2 no longer where common
michael
parents:
11020
diff
changeset
|
964 }else{ |
10928 | 965 h->non_zero_count_cache[3+8*1 + 2*8*i]= |
966 h->non_zero_count_cache[3+8*2 + 2*8*i]= | |
967 h->non_zero_count_cache[0+8*1 + 8*i]= | |
968 h->non_zero_count_cache[0+8*4 + 8*i]= CABAC && !IS_INTRA(mb_type) ? 0 : 64; | |
10866 | 969 } |
970 } | |
971 | |
11022
44529d4292ce
Split fill_caches() between loopfilter & decode, the 2 no longer where common
michael
parents:
11020
diff
changeset
|
972 if( CABAC ) { |
10866 | 973 // top_cbp |
974 if(top_type) { | |
975 h->top_cbp = h->cbp_table[top_xy]; | |
976 } else { | |
11300 | 977 h->top_cbp = IS_INTRA(mb_type) ? 0x1CF : 0x00F; |
10866 | 978 } |
979 // left_cbp | |
980 if (left_type[0]) { | |
11301
5843fc07bda0
Remove some useless operations from the code setting left_cbp.
michael
parents:
11300
diff
changeset
|
981 h->left_cbp = (h->cbp_table[left_xy[0]] & 0x1f0) |
5843fc07bda0
Remove some useless operations from the code setting left_cbp.
michael
parents:
11300
diff
changeset
|
982 | ((h->cbp_table[left_xy[0]]>>(left_block[0]&(~1)))&2) |
5843fc07bda0
Remove some useless operations from the code setting left_cbp.
michael
parents:
11300
diff
changeset
|
983 | (((h->cbp_table[left_xy[1]]>>(left_block[2]&(~1)))&2) << 2); |
10866 | 984 } else { |
11300 | 985 h->left_cbp = IS_INTRA(mb_type) ? 0x1CF : 0x00F; |
10866 | 986 } |
987 } | |
11158
81c3f88f460f
Skiped MBs dont need the cbp stuff so skip initing that.
michael
parents:
11156
diff
changeset
|
988 } |
10866 | 989 |
990 #if 1 | |
11144
0f7dcfca7b2e
Dont calculate any surrounding MVs for temporal MBs
michael
parents:
11102
diff
changeset
|
991 if(IS_INTER(mb_type) || (IS_DIRECT(mb_type) && h->direct_spatial_mv_pred)){ |
10866 | 992 int list; |
993 for(list=0; list<h->list_count; list++){ | |
11145
8805efb4c3fd
Move setting MB_TYPE_L0L1 for direct MBs up, this is simpler.
michael
parents:
11144
diff
changeset
|
994 if(!USES_LIST(mb_type, list)){ |
10866 | 995 /*if(!h->mv_cache_clean[list]){ |
996 memset(h->mv_cache [list], 0, 8*5*2*sizeof(int16_t)); //FIXME clean only input? clean at all? | |
997 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t)); | |
998 h->mv_cache_clean[list]= 1; | |
999 }*/ | |
1000 continue; | |
1001 } | |
11144
0f7dcfca7b2e
Dont calculate any surrounding MVs for temporal MBs
michael
parents:
11102
diff
changeset
|
1002 assert(!(IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)); |
0f7dcfca7b2e
Dont calculate any surrounding MVs for temporal MBs
michael
parents:
11102
diff
changeset
|
1003 |
10866 | 1004 h->mv_cache_clean[list]= 0; |
1005 | |
1006 if(USES_LIST(top_type, list)){ | |
1007 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; | |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10987
diff
changeset
|
1008 AV_COPY128(h->mv_cache[list][scan8[0] + 0 - 1*8], s->current_picture.motion_val[list][b_xy + 0]); |
10928 | 1009 h->ref_cache[list][scan8[0] + 0 - 1*8]= |
11292
411ab09ada91
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
michael
parents:
11288
diff
changeset
|
1010 h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][4*top_xy + 2]; |
10928 | 1011 h->ref_cache[list][scan8[0] + 2 - 1*8]= |
11292
411ab09ada91
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
michael
parents:
11288
diff
changeset
|
1012 h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][4*top_xy + 3]; |
10866 | 1013 }else{ |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10987
diff
changeset
|
1014 AV_ZERO128(h->mv_cache[list][scan8[0] + 0 - 1*8]); |
11203 | 1015 AV_WN32A(&h->ref_cache[list][scan8[0] + 0 - 1*8], ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101); |
10866 | 1016 } |
1017 | |
11334
e0428148bcf7
Load the whole left side of mv&ref only when needed.
michael
parents:
11307
diff
changeset
|
1018 if(mb_type & (MB_TYPE_16x8|MB_TYPE_8x8)){ |
10866 | 1019 for(i=0; i<2; i++){ |
1020 int cache_idx = scan8[0] - 1 + i*2*8; | |
1021 if(USES_LIST(left_type[i], list)){ | |
1022 const int b_xy= h->mb2b_xy[left_xy[i]] + 3; | |
11292
411ab09ada91
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
michael
parents:
11288
diff
changeset
|
1023 const int b8_xy= 4*left_xy[i] + 1; |
11203 | 1024 AV_COPY32(h->mv_cache[list][cache_idx ], s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[0+i*2]]); |
1025 AV_COPY32(h->mv_cache[list][cache_idx+8], s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[1+i*2]]); | |
11292
411ab09ada91
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
michael
parents:
11288
diff
changeset
|
1026 h->ref_cache[list][cache_idx ]= s->current_picture.ref_index[list][b8_xy + (left_block[0+i*2]&~1)]; |
411ab09ada91
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
michael
parents:
11288
diff
changeset
|
1027 h->ref_cache[list][cache_idx+8]= s->current_picture.ref_index[list][b8_xy + (left_block[1+i*2]&~1)]; |
10866 | 1028 }else{ |
11203 | 1029 AV_ZERO32(h->mv_cache [list][cache_idx ]); |
1030 AV_ZERO32(h->mv_cache [list][cache_idx+8]); | |
10866 | 1031 h->ref_cache[list][cache_idx ]= |
11019 | 1032 h->ref_cache[list][cache_idx+8]= (left_type[i]) ? LIST_NOT_USED : PART_NOT_AVAILABLE; |
10866 | 1033 } |
1034 } | |
11334
e0428148bcf7
Load the whole left side of mv&ref only when needed.
michael
parents:
11307
diff
changeset
|
1035 }else{ |
e0428148bcf7
Load the whole left side of mv&ref only when needed.
michael
parents:
11307
diff
changeset
|
1036 if(USES_LIST(left_type[0], list)){ |
e0428148bcf7
Load the whole left side of mv&ref only when needed.
michael
parents:
11307
diff
changeset
|
1037 const int b_xy= h->mb2b_xy[left_xy[0]] + 3; |
e0428148bcf7
Load the whole left side of mv&ref only when needed.
michael
parents:
11307
diff
changeset
|
1038 const int b8_xy= 4*left_xy[0] + 1; |
e0428148bcf7
Load the whole left side of mv&ref only when needed.
michael
parents:
11307
diff
changeset
|
1039 AV_COPY32(h->mv_cache[list][scan8[0] - 1], s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[0]]); |
e0428148bcf7
Load the whole left side of mv&ref only when needed.
michael
parents:
11307
diff
changeset
|
1040 h->ref_cache[list][scan8[0] - 1]= s->current_picture.ref_index[list][b8_xy + (left_block[0]&~1)]; |
e0428148bcf7
Load the whole left side of mv&ref only when needed.
michael
parents:
11307
diff
changeset
|
1041 }else{ |
e0428148bcf7
Load the whole left side of mv&ref only when needed.
michael
parents:
11307
diff
changeset
|
1042 AV_ZERO32(h->mv_cache [list][scan8[0] - 1]); |
e0428148bcf7
Load the whole left side of mv&ref only when needed.
michael
parents:
11307
diff
changeset
|
1043 h->ref_cache[list][scan8[0] - 1]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE; |
e0428148bcf7
Load the whole left side of mv&ref only when needed.
michael
parents:
11307
diff
changeset
|
1044 } |
e0428148bcf7
Load the whole left side of mv&ref only when needed.
michael
parents:
11307
diff
changeset
|
1045 } |
10866 | 1046 |
1047 if(USES_LIST(topright_type, list)){ | |
1048 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride; | |
11203 | 1049 AV_COPY32(h->mv_cache[list][scan8[0] + 4 - 1*8], s->current_picture.motion_val[list][b_xy]); |
11292
411ab09ada91
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
michael
parents:
11288
diff
changeset
|
1050 h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][4*topright_xy + 2]; |
10866 | 1051 }else{ |
11203 | 1052 AV_ZERO32(h->mv_cache [list][scan8[0] + 4 - 1*8]); |
10866 | 1053 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; |
1054 } | |
11302
090fcf7610e8
Only load the topleft mv/ref when the topright is unavailable.
michael
parents:
11301
diff
changeset
|
1055 if(h->ref_cache[list][scan8[0] + 4 - 1*8] < 0){ |
090fcf7610e8
Only load the topleft mv/ref when the topright is unavailable.
michael
parents:
11301
diff
changeset
|
1056 if(USES_LIST(topleft_type, list)){ |
090fcf7610e8
Only load the topleft mv/ref when the topright is unavailable.
michael
parents:
11301
diff
changeset
|
1057 const int b_xy = h->mb2b_xy [topleft_xy] + 3 + h->b_stride + (h->topleft_partition & 2*h->b_stride); |
090fcf7610e8
Only load the topleft mv/ref when the topright is unavailable.
michael
parents:
11301
diff
changeset
|
1058 const int b8_xy= 4*topleft_xy + 1 + (h->topleft_partition & 2); |
090fcf7610e8
Only load the topleft mv/ref when the topright is unavailable.
michael
parents:
11301
diff
changeset
|
1059 AV_COPY32(h->mv_cache[list][scan8[0] - 1 - 1*8], s->current_picture.motion_val[list][b_xy]); |
090fcf7610e8
Only load the topleft mv/ref when the topright is unavailable.
michael
parents:
11301
diff
changeset
|
1060 h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy]; |
090fcf7610e8
Only load the topleft mv/ref when the topright is unavailable.
michael
parents:
11301
diff
changeset
|
1061 }else{ |
090fcf7610e8
Only load the topleft mv/ref when the topright is unavailable.
michael
parents:
11301
diff
changeset
|
1062 AV_ZERO32(h->mv_cache[list][scan8[0] - 1 - 1*8]); |
090fcf7610e8
Only load the topleft mv/ref when the topright is unavailable.
michael
parents:
11301
diff
changeset
|
1063 h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; |
090fcf7610e8
Only load the topleft mv/ref when the topright is unavailable.
michael
parents:
11301
diff
changeset
|
1064 } |
090fcf7610e8
Only load the topleft mv/ref when the topright is unavailable.
michael
parents:
11301
diff
changeset
|
1065 } |
10866 | 1066 |
11159 | 1067 if((mb_type&(MB_TYPE_SKIP|MB_TYPE_DIRECT2)) && !FRAME_MBAFF) |
10866 | 1068 continue; |
1069 | |
11156
81ef4df2c774
Also skip direct/mvd_cache init for skiped blocks.
michael
parents:
11155
diff
changeset
|
1070 if(!(mb_type&(MB_TYPE_SKIP|MB_TYPE_DIRECT2))) { |
10866 | 1071 h->ref_cache[list][scan8[4 ]] = |
1072 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; | |
11203 | 1073 AV_ZERO32(h->mv_cache [list][scan8[4 ]]); |
1074 AV_ZERO32(h->mv_cache [list][scan8[12]]); | |
10866 | 1075 |
11155 | 1076 if( CABAC ) { |
10866 | 1077 /* XXX beurk, Load mvd */ |
1078 if(USES_LIST(top_type, list)){ | |
11283
853e93a50fe5
Cut the size of mvd_table by yet another factor of 2.
michael
parents:
11282
diff
changeset
|
1079 const int b_xy= h->mb2br_xy[top_xy]; |
11277
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
1080 AV_COPY64(h->mvd_cache[list][scan8[0] + 0 - 1*8], h->mvd_table[list][b_xy + 0]); |
10866 | 1081 }else{ |
11277
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
1082 AV_ZERO64(h->mvd_cache[list][scan8[0] + 0 - 1*8]); |
10866 | 1083 } |
1084 if(USES_LIST(left_type[0], list)){ | |
11283
853e93a50fe5
Cut the size of mvd_table by yet another factor of 2.
michael
parents:
11282
diff
changeset
|
1085 const int b_xy= h->mb2br_xy[left_xy[0]] + 6; |
853e93a50fe5
Cut the size of mvd_table by yet another factor of 2.
michael
parents:
11282
diff
changeset
|
1086 AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 0*8], h->mvd_table[list][b_xy - left_block[0]]); |
853e93a50fe5
Cut the size of mvd_table by yet another factor of 2.
michael
parents:
11282
diff
changeset
|
1087 AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 1*8], h->mvd_table[list][b_xy - left_block[1]]); |
10866 | 1088 }else{ |
11277
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
1089 AV_ZERO16(h->mvd_cache [list][scan8[0] - 1 + 0*8]); |
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
1090 AV_ZERO16(h->mvd_cache [list][scan8[0] - 1 + 1*8]); |
10866 | 1091 } |
1092 if(USES_LIST(left_type[1], list)){ | |
11283
853e93a50fe5
Cut the size of mvd_table by yet another factor of 2.
michael
parents:
11282
diff
changeset
|
1093 const int b_xy= h->mb2br_xy[left_xy[1]] + 6; |
853e93a50fe5
Cut the size of mvd_table by yet another factor of 2.
michael
parents:
11282
diff
changeset
|
1094 AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 2*8], h->mvd_table[list][b_xy - left_block[2]]); |
853e93a50fe5
Cut the size of mvd_table by yet another factor of 2.
michael
parents:
11282
diff
changeset
|
1095 AV_COPY16(h->mvd_cache[list][scan8[0] - 1 + 3*8], h->mvd_table[list][b_xy - left_block[3]]); |
10866 | 1096 }else{ |
11277
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
1097 AV_ZERO16(h->mvd_cache [list][scan8[0] - 1 + 2*8]); |
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
1098 AV_ZERO16(h->mvd_cache [list][scan8[0] - 1 + 3*8]); |
10866 | 1099 } |
11277
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
1100 AV_ZERO16(h->mvd_cache [list][scan8[4 ]]); |
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
1101 AV_ZERO16(h->mvd_cache [list][scan8[12]]); |
10866 | 1102 if(h->slice_type_nos == FF_B_TYPE){ |
11167 | 1103 fill_rectangle(&h->direct_cache[scan8[0]], 4, 4, 8, MB_TYPE_16x16>>1, 1); |
10866 | 1104 |
1105 if(IS_DIRECT(top_type)){ | |
11496 | 1106 AV_WN32A(&h->direct_cache[scan8[0] - 1*8], 0x01010101u*(MB_TYPE_DIRECT2>>1)); |
10866 | 1107 }else if(IS_8X8(top_type)){ |
11288 | 1108 int b8_xy = 4*top_xy; |
1109 h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy + 2]; | |
1110 h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 3]; | |
10866 | 1111 }else{ |
11203 | 1112 AV_WN32A(&h->direct_cache[scan8[0] - 1*8], 0x01010101*(MB_TYPE_16x16>>1)); |
10866 | 1113 } |
1114 | |
1115 if(IS_DIRECT(left_type[0])) | |
11167 | 1116 h->direct_cache[scan8[0] - 1 + 0*8]= MB_TYPE_DIRECT2>>1; |
10866 | 1117 else if(IS_8X8(left_type[0])) |
11288 | 1118 h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[4*left_xy[0] + 1 + (left_block[0]&~1)]; |
10866 | 1119 else |
11167 | 1120 h->direct_cache[scan8[0] - 1 + 0*8]= MB_TYPE_16x16>>1; |
10866 | 1121 |
1122 if(IS_DIRECT(left_type[1])) | |
11167 | 1123 h->direct_cache[scan8[0] - 1 + 2*8]= MB_TYPE_DIRECT2>>1; |
10866 | 1124 else if(IS_8X8(left_type[1])) |
11288 | 1125 h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[4*left_xy[1] + 1 + (left_block[2]&~1)]; |
10866 | 1126 else |
11167 | 1127 h->direct_cache[scan8[0] - 1 + 2*8]= MB_TYPE_16x16>>1; |
10866 | 1128 } |
1129 } | |
11155 | 1130 } |
10866 | 1131 if(FRAME_MBAFF){ |
1132 #define MAP_MVS\ | |
1133 MAP_F2F(scan8[0] - 1 - 1*8, topleft_type)\ | |
1134 MAP_F2F(scan8[0] + 0 - 1*8, top_type)\ | |
1135 MAP_F2F(scan8[0] + 1 - 1*8, top_type)\ | |
1136 MAP_F2F(scan8[0] + 2 - 1*8, top_type)\ | |
1137 MAP_F2F(scan8[0] + 3 - 1*8, top_type)\ | |
1138 MAP_F2F(scan8[0] + 4 - 1*8, topright_type)\ | |
1139 MAP_F2F(scan8[0] - 1 + 0*8, left_type[0])\ | |
1140 MAP_F2F(scan8[0] - 1 + 1*8, left_type[0])\ | |
1141 MAP_F2F(scan8[0] - 1 + 2*8, left_type[1])\ | |
1142 MAP_F2F(scan8[0] - 1 + 3*8, left_type[1]) | |
1143 if(MB_FIELD){ | |
1144 #define MAP_F2F(idx, mb_type)\ | |
1145 if(!IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\ | |
1146 h->ref_cache[list][idx] <<= 1;\ | |
1147 h->mv_cache[list][idx][1] /= 2;\ | |
11268
e817a3c2ec2e
Replace /2 by faster >>1 as the mvd values are now all positive.
michael
parents:
11267
diff
changeset
|
1148 h->mvd_cache[list][idx][1] >>=1;\ |
10866 | 1149 } |
1150 MAP_MVS | |
1151 #undef MAP_F2F | |
1152 }else{ | |
1153 #define MAP_F2F(idx, mb_type)\ | |
1154 if(IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\ | |
1155 h->ref_cache[list][idx] >>= 1;\ | |
1156 h->mv_cache[list][idx][1] <<= 1;\ | |
1157 h->mvd_cache[list][idx][1] <<= 1;\ | |
1158 } | |
1159 MAP_MVS | |
1160 #undef MAP_F2F | |
1161 } | |
1162 } | |
1163 } | |
1164 } | |
1165 #endif | |
1166 | |
10928 | 1167 h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]); |
10907 | 1168 } |
1169 | |
10910 | 1170 /** |
10866 | 1171 * gets the predicted intra4x4 prediction mode. |
1172 */ | |
1173 static inline int pred_intra_mode(H264Context *h, int n){ | |
1174 const int index8= scan8[n]; | |
1175 const int left= h->intra4x4_pred_mode_cache[index8 - 1]; | |
1176 const int top = h->intra4x4_pred_mode_cache[index8 - 8]; | |
1177 const int min= FFMIN(left, top); | |
1178 | |
1179 tprintf(h->s.avctx, "mode:%d %d min:%d\n", left ,top, min); | |
1180 | |
1181 if(min<0) return DC_PRED; | |
1182 else return min; | |
1183 } | |
1184 | |
1185 static inline void write_back_non_zero_count(H264Context *h){ | |
1186 const int mb_xy= h->mb_xy; | |
1187 | |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10987
diff
changeset
|
1188 AV_COPY64(&h->non_zero_count[mb_xy][ 0], &h->non_zero_count_cache[0+8*1]); |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10987
diff
changeset
|
1189 AV_COPY64(&h->non_zero_count[mb_xy][ 8], &h->non_zero_count_cache[0+8*2]); |
11203 | 1190 AV_COPY32(&h->non_zero_count[mb_xy][16], &h->non_zero_count_cache[0+8*5]); |
1191 AV_COPY32(&h->non_zero_count[mb_xy][20], &h->non_zero_count_cache[4+8*3]); | |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10987
diff
changeset
|
1192 AV_COPY64(&h->non_zero_count[mb_xy][24], &h->non_zero_count_cache[0+8*4]); |
10866 | 1193 } |
1194 | |
1195 static inline void write_back_motion(H264Context *h, int mb_type){ | |
1196 MpegEncContext * const s = &h->s; | |
11292
411ab09ada91
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
michael
parents:
11288
diff
changeset
|
1197 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride; //try mb2b(8)_xy |
411ab09ada91
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
michael
parents:
11288
diff
changeset
|
1198 const int b8_xy= 4*h->mb_xy; |
10866 | 1199 int list; |
1200 | |
1201 if(!USES_LIST(mb_type, 0)) | |
11292
411ab09ada91
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
michael
parents:
11288
diff
changeset
|
1202 fill_rectangle(&s->current_picture.ref_index[0][b8_xy], 2, 2, 2, (uint8_t)LIST_NOT_USED, 1); |
10866 | 1203 |
1204 for(list=0; list<h->list_count; list++){ | |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10987
diff
changeset
|
1205 int y, b_stride; |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10987
diff
changeset
|
1206 int16_t (*mv_dst)[2]; |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10987
diff
changeset
|
1207 int16_t (*mv_src)[2]; |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10987
diff
changeset
|
1208 |
10866 | 1209 if(!USES_LIST(mb_type, list)) |
1210 continue; | |
1211 | |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10987
diff
changeset
|
1212 b_stride = h->b_stride; |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10987
diff
changeset
|
1213 mv_dst = &s->current_picture.motion_val[list][b_xy]; |
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10987
diff
changeset
|
1214 mv_src = &h->mv_cache[list][scan8[0]]; |
10866 | 1215 for(y=0; y<4; y++){ |
11002
1c8892d7a090
H.264: Use 64-/128-bit write-combining macros for copies
astrange
parents:
10987
diff
changeset
|
1216 AV_COPY128(mv_dst + y*b_stride, mv_src + 8*y); |
10866 | 1217 } |
10893
2aafcafbe1f0
Replace cabac checks in inline functions from h264.h with constants.
michael
parents:
10883
diff
changeset
|
1218 if( CABAC ) { |
11283
853e93a50fe5
Cut the size of mvd_table by yet another factor of 2.
michael
parents:
11282
diff
changeset
|
1219 uint8_t (*mvd_dst)[2] = &h->mvd_table[list][FMO ? 8*h->mb_xy : h->mb2br_xy[h->mb_xy]]; |
11277
c12d6c6c027e
Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
michael
parents:
11268
diff
changeset
|
1220 uint8_t (*mvd_src)[2] = &h->mvd_cache[list][scan8[0]]; |
10866 | 1221 if(IS_SKIP(mb_type)) |
11283
853e93a50fe5
Cut the size of mvd_table by yet another factor of 2.
michael
parents:
11282
diff
changeset
|
1222 AV_ZERO128(mvd_dst); |
853e93a50fe5
Cut the size of mvd_table by yet another factor of 2.
michael
parents:
11282
diff
changeset
|
1223 else{ |
853e93a50fe5
Cut the size of mvd_table by yet another factor of 2.
michael
parents:
11282
diff
changeset
|
1224 AV_COPY64(mvd_dst, mvd_src + 8*3); |
11284
aaca4b58880f
unroll tiny and trivial loop. Same speed but clearer.
michael
parents:
11283
diff
changeset
|
1225 AV_COPY16(mvd_dst + 3 + 3, mvd_src + 3 + 8*0); |
aaca4b58880f
unroll tiny and trivial loop. Same speed but clearer.
michael
parents:
11283
diff
changeset
|
1226 AV_COPY16(mvd_dst + 3 + 2, mvd_src + 3 + 8*1); |
aaca4b58880f
unroll tiny and trivial loop. Same speed but clearer.
michael
parents:
11283
diff
changeset
|
1227 AV_COPY16(mvd_dst + 3 + 1, mvd_src + 3 + 8*2); |
10866 | 1228 } |
1229 } | |
1230 | |
1231 { | |
1232 int8_t *ref_index = &s->current_picture.ref_index[list][b8_xy]; | |
11292
411ab09ada91
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
michael
parents:
11288
diff
changeset
|
1233 ref_index[0+0*2]= h->ref_cache[list][scan8[0]]; |
411ab09ada91
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
michael
parents:
11288
diff
changeset
|
1234 ref_index[1+0*2]= h->ref_cache[list][scan8[4]]; |
411ab09ada91
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
michael
parents:
11288
diff
changeset
|
1235 ref_index[0+1*2]= h->ref_cache[list][scan8[8]]; |
411ab09ada91
Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride to
michael
parents:
11288
diff
changeset
|
1236 ref_index[1+1*2]= h->ref_cache[list][scan8[12]]; |
10866 | 1237 } |
1238 } | |
1239 | |
10893
2aafcafbe1f0
Replace cabac checks in inline functions from h264.h with constants.
michael
parents:
10883
diff
changeset
|
1240 if(h->slice_type_nos == FF_B_TYPE && CABAC){ |
10866 | 1241 if(IS_8X8(mb_type)){ |
11288 | 1242 uint8_t *direct_table = &h->direct_table[4*h->mb_xy]; |
1243 direct_table[1] = h->sub_mb_type[1]>>1; | |
1244 direct_table[2] = h->sub_mb_type[2]>>1; | |
1245 direct_table[3] = h->sub_mb_type[3]>>1; | |
10866 | 1246 } |
1247 } | |
1248 } | |
1249 | |
1250 static inline int get_dct8x8_allowed(H264Context *h){ | |
1251 if(h->sps.direct_8x8_inference_flag) | |
11203 | 1252 return !(AV_RN64A(h->sub_mb_type) & ((MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_8x8 )*0x0001000100010001ULL)); |
10866 | 1253 else |
11203 | 1254 return !(AV_RN64A(h->sub_mb_type) & ((MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_8x8|MB_TYPE_DIRECT2)*0x0001000100010001ULL)); |
10866 | 1255 } |
1256 | |
1257 /** | |
1258 * decodes a P_SKIP or B_SKIP macroblock | |
1259 */ | |
12096
900b6c2523dc
Add av_unused to decode_mb_skip declaration to fix the following warning:
diego
parents:
12093
diff
changeset
|
1260 static void av_unused decode_mb_skip(H264Context *h){ |
10866 | 1261 MpegEncContext * const s = &h->s; |
1262 const int mb_xy= h->mb_xy; | |
1263 int mb_type=0; | |
1264 | |
10906 | 1265 memset(h->non_zero_count[mb_xy], 0, 32); |
10866 | 1266 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui |
1267 | |
1268 if(MB_FIELD) | |
1269 mb_type|= MB_TYPE_INTERLACED; | |
1270 | |
1271 if( h->slice_type_nos == FF_B_TYPE ) | |
1272 { | |
1273 // just for fill_caches. pred_direct_motion will set the real mb_type | |
11145
8805efb4c3fd
Move setting MB_TYPE_L0L1 for direct MBs up, this is simpler.
michael
parents:
11144
diff
changeset
|
1274 mb_type|= MB_TYPE_L0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP; |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
1275 if(h->direct_spatial_mv_pred){ |
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
1276 fill_decode_neighbors(h, mb_type); |
10907 | 1277 fill_decode_caches(h, mb_type); //FIXME check what is needed and what not ... |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
1278 } |
10866 | 1279 ff_h264_pred_direct_motion(h, &mb_type); |
1280 mb_type|= MB_TYPE_SKIP; | |
1281 } | |
1282 else | |
1283 { | |
1284 int mx, my; | |
1285 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; | |
1286 | |
11183
d1a855cb0a0c
Split setting neighboring MBs from fill_decode_caches()
michael
parents:
11167
diff
changeset
|
1287 fill_decode_neighbors(h, mb_type); |
10907 | 1288 fill_decode_caches(h, mb_type); //FIXME check what is needed and what not ... |
10866 | 1289 pred_pskip_motion(h, &mx, &my); |
1290 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); | |
1291 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4); | |
1292 } | |
1293 | |
1294 write_back_motion(h, mb_type); | |
1295 s->current_picture.mb_type[mb_xy]= mb_type; | |
1296 s->current_picture.qscale_table[mb_xy]= s->qscale; | |
1297 h->slice_table[ mb_xy ]= h->slice_num; | |
1298 h->prev_mb_skipped= 1; | |
1299 } | |
1300 | |
10883
4701b9355d93
Add forgotten include of h264_mvpred.h to h264.h.
michael
parents:
10869
diff
changeset
|
1301 #include "h264_mvpred.h" //For pred_pskip_motion() |
4701b9355d93
Add forgotten include of h264_mvpred.h to h264.h.
michael
parents:
10869
diff
changeset
|
1302 |
7760 | 1303 #endif /* AVCODEC_H264_H */ |