annotate h264.c @ 4048:bf6791303fa0 libavcodec

1 instruction less
author michael
date Fri, 20 Oct 2006 08:46:33 +0000
parents 643cdc58bd69
children 19f07b651d79
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1 /*
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
15 * Lesser General Public License for more details.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
16 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3927
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 3029
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
20 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
21 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
22
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
23 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
24 * @file h264.c
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
25 * H.264 / AVC / MPEG4 part10 codec.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
26 * @author Michael Niedermayer <michaelni@gmx.at>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
27 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
28
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
29 #include "common.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
30 #include "dsputil.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
31 #include "avcodec.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
32 #include "mpegvideo.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
33 #include "h264data.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
34 #include "golomb.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
35
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
36 #include "cabac.h"
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
37
3284
a224d9752912 don't force asserts in release builds. 2% faster h264.
lorenm
parents: 3219
diff changeset
38 //#undef NDEBUG
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
39 #include <assert.h>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
40
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
41 #define interlaced_dct interlaced_dct_is_a_bad_name
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
42 #define mb_intra mb_intra_isnt_initalized_see_mb_type
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
43
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
44 #define LUMA_DC_BLOCK_INDEX 25
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
45 #define CHROMA_DC_BLOCK_INDEX 26
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
46
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
47 #define CHROMA_DC_COEFF_TOKEN_VLC_BITS 8
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
48 #define COEFF_TOKEN_VLC_BITS 8
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
49 #define TOTAL_ZEROS_VLC_BITS 9
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
50 #define CHROMA_DC_TOTAL_ZEROS_VLC_BITS 3
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
51 #define RUN_VLC_BITS 3
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
52 #define RUN7_VLC_BITS 6
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
53
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
54 #define MAX_SPS_COUNT 32
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
55 #define MAX_PPS_COUNT 256
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
56
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
57 #define MAX_MMCO_COUNT 66
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
58
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
59 /* Compiling in interlaced support reduces the speed
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
60 * of progressive decoding by about 2%. */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
61 #define ALLOW_INTERLACE
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
62
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
63 #ifdef ALLOW_INTERLACE
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
64 #define MB_MBAFF h->mb_mbaff
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
65 #define MB_FIELD h->mb_field_decoding_flag
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
66 #define FRAME_MBAFF h->mb_aff_frame
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
67 #else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
68 #define MB_MBAFF 0
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
69 #define MB_FIELD 0
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
70 #define FRAME_MBAFF 0
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
71 #undef IS_INTERLACED
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
72 #define IS_INTERLACED(mb_type) 0
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
73 #endif
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
74
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
75 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
76 * Sequence parameter set
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
77 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
78 typedef struct SPS{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
79
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
80 int profile_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
81 int level_idc;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
82 int transform_bypass; ///< qpprime_y_zero_transform_bypass_flag
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
83 int log2_max_frame_num; ///< log2_max_frame_num_minus4 + 4
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
84 int poc_type; ///< pic_order_cnt_type
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
85 int log2_max_poc_lsb; ///< log2_max_pic_order_cnt_lsb_minus4
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
86 int delta_pic_order_always_zero_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
87 int offset_for_non_ref_pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
88 int offset_for_top_to_bottom_field;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
89 int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
90 int ref_frame_count; ///< num_ref_frames
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
91 int gaps_in_frame_num_allowed_flag;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
92 int mb_width; ///< frame_width_in_mbs_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
93 int mb_height; ///< frame_height_in_mbs_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
94 int frame_mbs_only_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
95 int mb_aff; ///<mb_adaptive_frame_field_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
96 int direct_8x8_inference_flag;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
97 int crop; ///< frame_cropping_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
98 int crop_left; ///< frame_cropping_rect_left_offset
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
99 int crop_right; ///< frame_cropping_rect_right_offset
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
100 int crop_top; ///< frame_cropping_rect_top_offset
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
101 int crop_bottom; ///< frame_cropping_rect_bottom_offset
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
102 int vui_parameters_present_flag;
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
103 AVRational sar;
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
104 int timing_info_present_flag;
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
105 uint32_t num_units_in_tick;
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
106 uint32_t time_scale;
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
107 int fixed_frame_rate_flag;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
108 short offset_for_ref_frame[256]; //FIXME dyn aloc?
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
109 int bitstream_restriction_flag;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
110 int num_reorder_frames;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
111 int scaling_matrix_present;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
112 uint8_t scaling_matrix4[6][16];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
113 uint8_t scaling_matrix8[2][64];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
114 }SPS;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
115
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
116 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
117 * Picture parameter set
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
118 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
119 typedef struct PPS{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
120 int sps_id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
121 int cabac; ///< entropy_coding_mode_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
122 int pic_order_present; ///< pic_order_present_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
123 int slice_group_count; ///< num_slice_groups_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
124 int mb_slice_group_map_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
125 int ref_count[2]; ///< num_ref_idx_l0/1_active_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
126 int weighted_pred; ///< weighted_pred_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
127 int weighted_bipred_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
128 int init_qp; ///< pic_init_qp_minus26 + 26
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
129 int init_qs; ///< pic_init_qs_minus26 + 26
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
130 int chroma_qp_index_offset;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
131 int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
132 int constrained_intra_pred; ///< constrained_intra_pred_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
133 int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
134 int transform_8x8_mode; ///< transform_8x8_mode_flag
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
135 uint8_t scaling_matrix4[6][16];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
136 uint8_t scaling_matrix8[2][64];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
137 }PPS;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
138
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
139 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
140 * Memory management control operation opcode.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
141 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
142 typedef enum MMCOOpcode{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
143 MMCO_END=0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
144 MMCO_SHORT2UNUSED,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
145 MMCO_LONG2UNUSED,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
146 MMCO_SHORT2LONG,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
147 MMCO_SET_MAX_LONG,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
148 MMCO_RESET,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
149 MMCO_LONG,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
150 } MMCOOpcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
151
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
152 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
153 * Memory management control operation.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
154 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
155 typedef struct MMCO{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
156 MMCOOpcode opcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
157 int short_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
158 int long_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
159 } MMCO;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
160
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
161 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
162 * H264Context
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
163 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
164 typedef struct H264Context{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
165 MpegEncContext s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
166 int nal_ref_idc;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
167 int nal_unit_type;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
168 #define NAL_SLICE 1
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
169 #define NAL_DPA 2
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
170 #define NAL_DPB 3
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
171 #define NAL_DPC 4
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
172 #define NAL_IDR_SLICE 5
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
173 #define NAL_SEI 6
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
174 #define NAL_SPS 7
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
175 #define NAL_PPS 8
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
176 #define NAL_AUD 9
2960
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
177 #define NAL_END_SEQUENCE 10
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
178 #define NAL_END_STREAM 11
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
179 #define NAL_FILLER_DATA 12
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
180 #define NAL_SPS_EXT 13
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
181 #define NAL_AUXILIARY_SLICE 19
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
182 uint8_t *rbsp_buffer;
3066
04b924f8f5a5 warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it
diego
parents: 3063
diff changeset
183 unsigned int rbsp_buffer_size;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
184
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
185 /**
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
186 * Used to parse AVC variant of h264
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
187 */
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
188 int is_avc; ///< this flag is != 0 if codec is avc1
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
189 int got_avcC; ///< flag used to parse avcC data only once
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
190 int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4)
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
191
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
192 int chroma_qp; //QPc
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
193
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
194 int prev_mb_skipped;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
195 int next_mb_skipped;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
196
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
197 //prediction stuff
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
198 int chroma_pred_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
199 int intra16x16_pred_mode;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
200
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
201 int top_mb_xy;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
202 int left_mb_xy[2];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
203
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
204 int8_t intra4x4_pred_mode_cache[5*8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
205 int8_t (*intra4x4_pred_mode)[8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
206 void (*pred4x4 [9+3])(uint8_t *src, uint8_t *topright, int stride);//FIXME move to dsp?
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
207 void (*pred8x8l [9+3])(uint8_t *src, int topleft, int topright, int stride);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
208 void (*pred8x8 [4+3])(uint8_t *src, int stride);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
209 void (*pred16x16[4+3])(uint8_t *src, int stride);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
210 unsigned int topleft_samples_available;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
211 unsigned int top_samples_available;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
212 unsigned int topright_samples_available;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
213 unsigned int left_samples_available;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
214 uint8_t (*top_borders[2])[16+2*8];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
215 uint8_t left_border[2*(17+2*9)];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
216
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
217 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
218 * non zero coeff count cache.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
219 * is 64 if not available.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
220 */
3089
072dbc669253 MSVC-compatible __align8/__align16 declaration
diego
parents: 3077
diff changeset
221 DECLARE_ALIGNED_8(uint8_t, non_zero_count_cache[6*8]);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
222 uint8_t (*non_zero_count)[16];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
223
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
224 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
225 * Motion vector cache.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
226 */
3089
072dbc669253 MSVC-compatible __align8/__align16 declaration
diego
parents: 3077
diff changeset
227 DECLARE_ALIGNED_8(int16_t, mv_cache[2][5*8][2]);
072dbc669253 MSVC-compatible __align8/__align16 declaration
diego
parents: 3077
diff changeset
228 DECLARE_ALIGNED_8(int8_t, ref_cache[2][5*8]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
229 #define LIST_NOT_USED -1 //FIXME rename?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
230 #define PART_NOT_AVAILABLE -2
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
231
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
232 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
233 * is 1 if the specific list MV&references are set to 0,0,-2.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
234 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
235 int mv_cache_clean[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
236
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
237 /**
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
238 * number of neighbors (top and/or left) that used 8x8 dct
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
239 */
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
240 int neighbor_transform_size;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
241
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
242 /**
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
243 * block_offset[ 0..23] for frame macroblocks
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
244 * block_offset[24..47] for field macroblocks
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
245 */
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
246 int block_offset[2*(16+8)];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
247
2641
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
248 uint32_t *mb2b_xy; //FIXME are these 4 a good idea?
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
249 uint32_t *mb2b8_xy;
2395
81516be6d0e4 vismv for h264 displayed incorrect motion vectors.
lorenm
parents: 2392
diff changeset
250 int b_stride; //FIXME use s->b4_stride
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
251 int b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
252
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
253 int mb_linesize; ///< may be equal to s->linesize or s->linesize*2, for mbaff
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
254 int mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
255
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
256 int emu_edge_width;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
257 int emu_edge_height;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
258
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
259 int halfpel_flag;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
260 int thirdpel_flag;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
261
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
262 int unknown_svq3_flag;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
263 int next_slice_index;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
264
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
265 SPS sps_buffer[MAX_SPS_COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
266 SPS sps; ///< current sps
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
267
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
268 PPS pps_buffer[MAX_PPS_COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
269 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
270 * current pps
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
271 */
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
272 PPS pps; //FIXME move to Picture perhaps? (->no) do we need that?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
273
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
274 uint32_t dequant4_buffer[6][52][16];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
275 uint32_t dequant8_buffer[2][52][64];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
276 uint32_t (*dequant4_coeff[6])[16];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
277 uint32_t (*dequant8_coeff[2])[64];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
278 int dequant_coeff_pps; ///< reinit tables when pps changes
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
279
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
280 int slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
281 uint8_t *slice_table_base;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
282 uint8_t *slice_table; ///< slice_table_base + 2*mb_stride + 1
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
283 int slice_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
284 int slice_type_fixed;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
285
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
286 //interlacing specific flags
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
287 int mb_aff_frame;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
288 int mb_field_decoding_flag;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
289 int mb_mbaff; ///< mb_aff_frame && mb_field_decoding_flag
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
290
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
291 int sub_mb_type[4];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
292
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
293 //POC stuff
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
294 int poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
295 int poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
296 int delta_poc_bottom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
297 int delta_poc[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
298 int frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
299 int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
300 int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
301 int frame_num_offset; ///< for POC type 2
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
302 int prev_frame_num_offset; ///< for POC type 2
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
303 int prev_frame_num; ///< frame_num of the last pic for POC type 1/2
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
304
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
305 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
306 * frame_num for frames or 2*frame_num for field pics.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
307 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
308 int curr_pic_num;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
309
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
310 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
311 * max_frame_num or 2*max_frame_num for field pics.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
312 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
313 int max_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
314
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
315 //Weighted pred stuff
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
316 int use_weight;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
317 int use_weight_chroma;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
318 int luma_log2_weight_denom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
319 int chroma_log2_weight_denom;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
320 int luma_weight[2][48];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
321 int luma_offset[2][48];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
322 int chroma_weight[2][48][2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
323 int chroma_offset[2][48][2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
324 int implicit_weight[48][48];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
325
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
326 //deblock
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
327 int deblocking_filter; ///< disable_deblocking_filter_idc with 1<->0
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
328 int slice_alpha_c0_offset;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
329 int slice_beta_offset;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
330
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
331 int redundant_pic_count;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
332
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
333 int direct_spatial_mv_pred;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
334 int dist_scale_factor[16];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
335 int dist_scale_factor_field[32];
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
336 int map_col_to_list0[2][16];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
337 int map_col_to_list0_field[2][32];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
338
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
339 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
340 * num_ref_idx_l0/1_active_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
341 */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
342 int ref_count[2]; ///< counts frames or fields, depending on current mb mode
2582
3c27a074de7a allow 16 refs with B-frames
lorenm
parents: 2581
diff changeset
343 Picture *short_ref[32];
3c27a074de7a allow 16 refs with B-frames
lorenm
parents: 2581
diff changeset
344 Picture *long_ref[32];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
345 Picture default_ref_list[2][32];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
346 Picture ref_list[2][48]; ///< 0..15: frame refs, 16..47: mbaff field refs
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
347 Picture *delayed_pic[16]; //FIXME size?
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
348 Picture *delayed_output_pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
349
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
350 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
351 * memory management control operations buffer.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
352 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
353 MMCO mmco[MAX_MMCO_COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
354 int mmco_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
355
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
356 int long_ref_count; ///< number of actual long term references
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
357 int short_ref_count; ///< number of actual short term references
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
358
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
359 //data partitioning
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
360 GetBitContext intra_gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
361 GetBitContext inter_gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
362 GetBitContext *intra_gb_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
363 GetBitContext *inter_gb_ptr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
364
3089
072dbc669253 MSVC-compatible __align8/__align16 declaration
diego
parents: 3077
diff changeset
365 DECLARE_ALIGNED_8(DCTELEM, mb[16*24]);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
366
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
367 /**
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
368 * Cabac
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
369 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
370 CABACContext cabac;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
371 uint8_t cabac_state[460];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
372 int cabac_init_idc;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
373
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
374 /* 0x100 -> non null luma_dc, 0x80/0x40 -> non null chroma_dc (cb/cr), 0x?0 -> chroma_cbp(0,1,2), 0x0? luma_cbp */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
375 uint16_t *cbp_table;
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
376 int cbp;
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
377 int top_cbp;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
378 int left_cbp;
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
379 /* chroma_pred_mode for i4x4 or i16x16, else 0 */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
380 uint8_t *chroma_pred_mode_table;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
381 int last_qscale_diff;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
382 int16_t (*mvd_table[2])[2];
3089
072dbc669253 MSVC-compatible __align8/__align16 declaration
diego
parents: 3077
diff changeset
383 DECLARE_ALIGNED_8(int16_t, mvd_cache[2][5*8][2]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
384 uint8_t *direct_table;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
385 uint8_t direct_cache[5*8];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
386
2748
135aa7d0bd17 avoid one transpose (730->680 dezicycles on duron)
michael
parents: 2717
diff changeset
387 uint8_t zigzag_scan[16];
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
388 uint8_t zigzag_scan8x8[64];
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
389 uint8_t zigzag_scan8x8_cavlc[64];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
390 uint8_t field_scan[16];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
391 uint8_t field_scan8x8[64];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
392 uint8_t field_scan8x8_cavlc[64];
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
393 const uint8_t *zigzag_scan_q0;
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
394 const uint8_t *zigzag_scan8x8_q0;
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
395 const uint8_t *zigzag_scan8x8_cavlc_q0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
396 const uint8_t *field_scan_q0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
397 const uint8_t *field_scan8x8_q0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
398 const uint8_t *field_scan8x8_cavlc_q0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
399
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
400 int x264_build;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
401 }H264Context;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
402
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
403 static VLC coeff_token_vlc[4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
404 static VLC chroma_dc_coeff_token_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
405
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
406 static VLC total_zeros_vlc[15];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
407 static VLC chroma_dc_total_zeros_vlc[3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
408
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
409 static VLC run_vlc[6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
410 static VLC run7_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
411
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
412 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
413 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
414 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize);
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
415 static void 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);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
416
3028
1fadd4c26175 tweak inlines.
lorenm
parents: 3005
diff changeset
417 static always_inline uint32_t pack16to32(int a, int b){
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
418 #ifdef WORDS_BIGENDIAN
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
419 return (b&0xFFFF) + (a<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
420 #else
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
421 return (a&0xFFFF) + (b<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
422 #endif
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
423 }
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
424
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
425 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
426 * fill a rectangle.
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
427 * @param h height of the rectangle, should be a constant
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
428 * @param w width of the rectangle, should be a constant
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
429 * @param size the size of val (1 or 4), should be a constant
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
430 */
3028
1fadd4c26175 tweak inlines.
lorenm
parents: 3005
diff changeset
431 static always_inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
432 uint8_t *p= (uint8_t*)vp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
433 assert(size==1 || size==4);
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
434 assert(w<=4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
435
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
436 w *= size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
437 stride *= size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
438
2962
fde28cb7e3d5 use PRIxN, %zd, %td formats where needed
mru
parents: 2960
diff changeset
439 assert((((long)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0);
2669
a4e3a37ed57b some asserts()
michael
parents: 2650
diff changeset
440 assert((stride&(w-1))==0);
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
441 if(w==2){
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
442 const uint16_t v= size==4 ? val : val*0x0101;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
443 *(uint16_t*)(p + 0*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
444 if(h==1) return;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
445 *(uint16_t*)(p + 1*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
446 if(h==2) return;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
447 *(uint16_t*)(p + 2*stride)=
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
448 *(uint16_t*)(p + 3*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
449 }else if(w==4){
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
450 const uint32_t v= size==4 ? val : val*0x01010101;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
451 *(uint32_t*)(p + 0*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
452 if(h==1) return;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
453 *(uint32_t*)(p + 1*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
454 if(h==2) return;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
455 *(uint32_t*)(p + 2*stride)=
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
456 *(uint32_t*)(p + 3*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
457 }else if(w==8){
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
458 //gcc can't optimize 64bit math on x86_32
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
459 #if defined(ARCH_X86_64) || (defined(MP_WORDSIZE) && MP_WORDSIZE >= 64)
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
460 const uint64_t v= val*0x0100000001ULL;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
461 *(uint64_t*)(p + 0*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
462 if(h==1) return;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
463 *(uint64_t*)(p + 1*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
464 if(h==2) return;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
465 *(uint64_t*)(p + 2*stride)=
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
466 *(uint64_t*)(p + 3*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
467 }else if(w==16){
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
468 const uint64_t v= val*0x0100000001ULL;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
469 *(uint64_t*)(p + 0+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
470 *(uint64_t*)(p + 8+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
471 *(uint64_t*)(p + 0+1*stride)=
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
472 *(uint64_t*)(p + 8+1*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
473 if(h==2) return;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
474 *(uint64_t*)(p + 0+2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
475 *(uint64_t*)(p + 8+2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
476 *(uint64_t*)(p + 0+3*stride)=
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
477 *(uint64_t*)(p + 8+3*stride)= v;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
478 #else
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
479 *(uint32_t*)(p + 0+0*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
480 *(uint32_t*)(p + 4+0*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
481 if(h==1) return;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
482 *(uint32_t*)(p + 0+1*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
483 *(uint32_t*)(p + 4+1*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
484 if(h==2) return;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
485 *(uint32_t*)(p + 0+2*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
486 *(uint32_t*)(p + 4+2*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
487 *(uint32_t*)(p + 0+3*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
488 *(uint32_t*)(p + 4+3*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
489 }else if(w==16){
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
490 *(uint32_t*)(p + 0+0*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
491 *(uint32_t*)(p + 4+0*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
492 *(uint32_t*)(p + 8+0*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
493 *(uint32_t*)(p +12+0*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
494 *(uint32_t*)(p + 0+1*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
495 *(uint32_t*)(p + 4+1*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
496 *(uint32_t*)(p + 8+1*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
497 *(uint32_t*)(p +12+1*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
498 if(h==2) return;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
499 *(uint32_t*)(p + 0+2*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
500 *(uint32_t*)(p + 4+2*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
501 *(uint32_t*)(p + 8+2*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
502 *(uint32_t*)(p +12+2*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
503 *(uint32_t*)(p + 0+3*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
504 *(uint32_t*)(p + 4+3*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
505 *(uint32_t*)(p + 8+3*stride)=
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
506 *(uint32_t*)(p +12+3*stride)= val;
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
507 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
508 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
509 assert(0);
3315
cfd452a6560b h264: faster fill_rectangle()
lorenm
parents: 3298
diff changeset
510 assert(h==4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
511 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
512
3028
1fadd4c26175 tweak inlines.
lorenm
parents: 3005
diff changeset
513 static void fill_caches(H264Context *h, int mb_type, int for_deblock){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
514 MpegEncContext * const s = &h->s;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
515 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
516 int topleft_xy, top_xy, topright_xy, left_xy[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
517 int topleft_type, top_type, topright_type, left_type[2];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
518 int left_block[8];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
519 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
520
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
521 //FIXME deblocking could skip the intra and nnz parts.
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
522 if(for_deblock && (h->slice_num == 1 || h->slice_table[mb_xy] == h->slice_table[mb_xy-s->mb_stride]) && !FRAME_MBAFF)
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
523 return;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
524
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
525 //wow what a mess, why didn't they simplify the interlacing&intra stuff, i can't imagine that these complex rules are worth it
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
526
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
527 top_xy = mb_xy - s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
528 topleft_xy = top_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
529 topright_xy= top_xy + 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
530 left_xy[1] = left_xy[0] = mb_xy-1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
531 left_block[0]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
532 left_block[1]= 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
533 left_block[2]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
534 left_block[3]= 3;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
535 left_block[4]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
536 left_block[5]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
537 left_block[6]= 8;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
538 left_block[7]= 11;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
539 if(FRAME_MBAFF){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
540 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
541 const int top_pair_xy = pair_xy - s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
542 const int topleft_pair_xy = top_pair_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
543 const int topright_pair_xy = top_pair_xy + 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
544 const int topleft_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topleft_pair_xy]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
545 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
546 const int topright_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[topright_pair_xy]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
547 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
548 const int curr_mb_frame_flag = !IS_INTERLACED(mb_type);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
549 const int bottom = (s->mb_y & 1);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
550 tprintf("fill_caches: curr_mb_frame_flag:%d, left_mb_frame_flag:%d, topleft_mb_frame_flag:%d, top_mb_frame_flag:%d, topright_mb_frame_flag:%d\n", curr_mb_frame_flag, left_mb_frame_flag, topleft_mb_frame_flag, top_mb_frame_flag, topright_mb_frame_flag);
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
551 if (bottom
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
552 ? !curr_mb_frame_flag // bottom macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
553 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
554 ) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
555 top_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
556 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
557 if (bottom
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
558 ? !curr_mb_frame_flag // bottom macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
559 : (!curr_mb_frame_flag && !topleft_mb_frame_flag) // top macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
560 ) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
561 topleft_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
562 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
563 if (bottom
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
564 ? !curr_mb_frame_flag // bottom macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
565 : (!curr_mb_frame_flag && !topright_mb_frame_flag) // top macroblock
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
566 ) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
567 topright_xy -= s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
568 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
569 if (left_mb_frame_flag != curr_mb_frame_flag) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
570 left_xy[1] = left_xy[0] = pair_xy - 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
571 if (curr_mb_frame_flag) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
572 if (bottom) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
573 left_block[0]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
574 left_block[1]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
575 left_block[2]= 3;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
576 left_block[3]= 3;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
577 left_block[4]= 8;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
578 left_block[5]= 11;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
579 left_block[6]= 8;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
580 left_block[7]= 11;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
581 } else {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
582 left_block[0]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
583 left_block[1]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
584 left_block[2]= 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
585 left_block[3]= 1;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
586 left_block[4]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
587 left_block[5]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
588 left_block[6]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
589 left_block[7]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
590 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
591 } else {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
592 left_xy[1] += s->mb_stride;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
593 //left_block[0]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
594 left_block[1]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
595 left_block[2]= 0;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
596 left_block[3]= 2;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
597 //left_block[4]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
598 left_block[5]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
599 left_block[6]= 7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
600 left_block[7]= 10;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
601 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
602 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
603 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
604
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
605 h->top_mb_xy = top_xy;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
606 h->left_mb_xy[0] = left_xy[0];
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
607 h->left_mb_xy[1] = left_xy[1];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
608 if(for_deblock){
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
609 topleft_type = 0;
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
610 topright_type = 0;
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
611 top_type = h->slice_table[top_xy ] < 255 ? s->current_picture.mb_type[top_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
612 left_type[0] = h->slice_table[left_xy[0] ] < 255 ? s->current_picture.mb_type[left_xy[0]] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
613 left_type[1] = h->slice_table[left_xy[1] ] < 255 ? s->current_picture.mb_type[left_xy[1]] : 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
614
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
615 if(FRAME_MBAFF && !IS_INTRA(mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
616 int list;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
617 int v = *(uint16_t*)&h->non_zero_count[mb_xy][14];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
618 for(i=0; i<16; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
619 h->non_zero_count_cache[scan8[i]] = (v>>i)&1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
620 for(list=0; list<1+(h->slice_type==B_TYPE); list++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
621 if(USES_LIST(mb_type,list)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
622 uint32_t *src = (uint32_t*)s->current_picture.motion_val[list][h->mb2b_xy[mb_xy]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
623 uint32_t *dst = (uint32_t*)h->mv_cache[list][scan8[0]];
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
624 int8_t *ref = &s->current_picture.ref_index[list][h->mb2b8_xy[mb_xy]];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
625 for(i=0; i<4; i++, dst+=8, src+=h->b_stride){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
626 dst[0] = src[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
627 dst[1] = src[1];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
628 dst[2] = src[2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
629 dst[3] = src[3];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
630 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
631 *(uint32_t*)&h->ref_cache[list][scan8[ 0]] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
632 *(uint32_t*)&h->ref_cache[list][scan8[ 2]] = pack16to32(ref[0],ref[1])*0x0101;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
633 ref += h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
634 *(uint32_t*)&h->ref_cache[list][scan8[ 8]] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
635 *(uint32_t*)&h->ref_cache[list][scan8[10]] = pack16to32(ref[0],ref[1])*0x0101;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
636 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
637 fill_rectangle(&h-> mv_cache[list][scan8[ 0]], 4, 4, 8, 0, 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
638 fill_rectangle(&h->ref_cache[list][scan8[ 0]], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
639 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
640 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
641 }
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
642 }else{
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
643 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
644 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
645 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
646 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
647 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
648 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
649
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
650 if(IS_INTRA(mb_type)){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
651 h->topleft_samples_available=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
652 h->top_samples_available=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
653 h->left_samples_available= 0xFFFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
654 h->topright_samples_available= 0xEEEA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
655
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
656 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
657 h->topleft_samples_available= 0xB3FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
658 h->top_samples_available= 0x33FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
659 h->topright_samples_available= 0x26EA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
660 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
661 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
662 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
663 h->topleft_samples_available&= 0xDF5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
664 h->left_samples_available&= 0x5F5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
665 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
666 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
667
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
668 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
669 h->topleft_samples_available&= 0x7FFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
670
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
671 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
672 h->topright_samples_available&= 0xFBFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
673
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
674 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
675 if(IS_INTRA4x4(top_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
676 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
677 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
678 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
679 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
680 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
681 int pred;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
682 if(!top_type || (IS_INTER(top_type) && h->pps.constrained_intra_pred))
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
683 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
684 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
685 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
686 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
687 h->intra4x4_pred_mode_cache[4+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
688 h->intra4x4_pred_mode_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
689 h->intra4x4_pred_mode_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
690 h->intra4x4_pred_mode_cache[7+8*0]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
691 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
692 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
693 if(IS_INTRA4x4(left_type[i])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
694 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[0+2*i]];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
695 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= h->intra4x4_pred_mode[left_xy[i]][left_block[1+2*i]];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
696 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
697 int pred;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
698 if(!left_type[i] || (IS_INTER(left_type[i]) && h->pps.constrained_intra_pred))
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
699 pred= -1;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
700 else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
701 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
702 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
703 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
704 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
705 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
706 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
707 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
708 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
709
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
710
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
711 /*
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
712 0 . T T. T T T T
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
713 1 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
714 2 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
715 3 . T TL . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
716 4 L . .L . . . .
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
717 5 L . .. . . . .
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
718 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
719 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
720 if(top_type){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
721 h->non_zero_count_cache[4+8*0]= h->non_zero_count[top_xy][4];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
722 h->non_zero_count_cache[5+8*0]= h->non_zero_count[top_xy][5];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
723 h->non_zero_count_cache[6+8*0]= h->non_zero_count[top_xy][6];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
724 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
725
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
726 h->non_zero_count_cache[1+8*0]= h->non_zero_count[top_xy][9];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
727 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
728
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
729 h->non_zero_count_cache[1+8*3]= h->non_zero_count[top_xy][12];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
730 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
731
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
732 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
733 h->non_zero_count_cache[4+8*0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
734 h->non_zero_count_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
735 h->non_zero_count_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
736 h->non_zero_count_cache[7+8*0]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
737
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
738 h->non_zero_count_cache[1+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
739 h->non_zero_count_cache[2+8*0]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
740
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
741 h->non_zero_count_cache[1+8*3]=
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
742 h->non_zero_count_cache[2+8*3]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
743
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
744 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
745
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
746 for (i=0; i<2; i++) {
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
747 if(left_type[i]){
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
748 h->non_zero_count_cache[3+8*1 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[0+2*i]];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
749 h->non_zero_count_cache[3+8*2 + 2*8*i]= h->non_zero_count[left_xy[i]][left_block[1+2*i]];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
750 h->non_zero_count_cache[0+8*1 + 8*i]= h->non_zero_count[left_xy[i]][left_block[4+2*i]];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
751 h->non_zero_count_cache[0+8*4 + 8*i]= h->non_zero_count[left_xy[i]][left_block[5+2*i]];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
752 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
753 h->non_zero_count_cache[3+8*1 + 2*8*i]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
754 h->non_zero_count_cache[3+8*2 + 2*8*i]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
755 h->non_zero_count_cache[0+8*1 + 8*i]=
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
756 h->non_zero_count_cache[0+8*4 + 8*i]= h->pps.cabac && !IS_INTRA(mb_type) ? 0 : 64;
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
757 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
758 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
759
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
760 if( h->pps.cabac ) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
761 // top_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
762 if(top_type) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
763 h->top_cbp = h->cbp_table[top_xy];
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
764 } else if(IS_INTRA(mb_type)) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
765 h->top_cbp = 0x1C0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
766 } else {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
767 h->top_cbp = 0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
768 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
769 // left_cbp
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
770 if (left_type[0]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
771 h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
772 } else if(IS_INTRA(mb_type)) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
773 h->left_cbp = 0x1C0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
774 } else {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
775 h->left_cbp = 0;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
776 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
777 if (left_type[0]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
778 h->left_cbp |= ((h->cbp_table[left_xy[0]]>>((left_block[0]&(~1))+1))&0x1) << 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
779 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
780 if (left_type[1]) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
781 h->left_cbp |= ((h->cbp_table[left_xy[1]]>>((left_block[2]&(~1))+1))&0x1) << 3;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
782 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
783 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
784
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
785 #if 1
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
786 if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
787 int list;
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
788 for(list=0; list<1+(h->slice_type==B_TYPE); list++){
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
789 if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type) && !h->deblocking_filter){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
790 /*if(!h->mv_cache_clean[list]){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
791 memset(h->mv_cache [list], 0, 8*5*2*sizeof(int16_t)); //FIXME clean only input? clean at all?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
792 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
793 h->mv_cache_clean[list]= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
794 }*/
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
795 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
796 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
797 h->mv_cache_clean[list]= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
798
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
799 if(USES_LIST(top_type, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
800 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
801 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
802 *(uint32_t*)h->mv_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
803 *(uint32_t*)h->mv_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
804 *(uint32_t*)h->mv_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
805 *(uint32_t*)h->mv_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + 3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
806 h->ref_cache[list][scan8[0] + 0 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
807 h->ref_cache[list][scan8[0] + 1 - 1*8]= s->current_picture.ref_index[list][b8_xy + 0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
808 h->ref_cache[list][scan8[0] + 2 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
809 h->ref_cache[list][scan8[0] + 3 - 1*8]= s->current_picture.ref_index[list][b8_xy + 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
810 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
811 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
812 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
813 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
814 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
815 *(uint32_t*)&h->ref_cache[list][scan8[0] + 0 - 1*8]= ((top_type ? LIST_NOT_USED : PART_NOT_AVAILABLE)&0xFF)*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
816 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
817
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
818 //FIXME unify cleanup or sth
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
819 if(USES_LIST(left_type[0], list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
820 const int b_xy= h->mb2b_xy[left_xy[0]] + 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
821 const int b8_xy= h->mb2b8_xy[left_xy[0]] + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
822 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 + 0*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[0]];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
823 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 + 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[1]];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
824 h->ref_cache[list][scan8[0] - 1 + 0*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0]>>1)];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
825 h->ref_cache[list][scan8[0] - 1 + 1*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[1]>>1)];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
826 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
827 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 0*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
828 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
829 h->ref_cache[list][scan8[0] - 1 + 0*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
830 h->ref_cache[list][scan8[0] - 1 + 1*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
831 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
832
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
833 if(USES_LIST(left_type[1], list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
834 const int b_xy= h->mb2b_xy[left_xy[1]] + 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
835 const int b8_xy= h->mb2b8_xy[left_xy[1]] + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
836 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 + 2*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[2]];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
837 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 + 3*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy + h->b_stride*left_block[3]];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
838 h->ref_cache[list][scan8[0] - 1 + 2*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[2]>>1)];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
839 h->ref_cache[list][scan8[0] - 1 + 3*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[3]>>1)];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
840 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
841 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 2*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
842 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 3*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
843 h->ref_cache[list][scan8[0] - 1 + 2*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
844 h->ref_cache[list][scan8[0] - 1 + 3*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE;
2669
a4e3a37ed57b some asserts()
michael
parents: 2650
diff changeset
845 assert((!left_type[0]) == (!left_type[1]));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
846 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
847
3519
5ef29058581e 10l in r5768 (broke mbaff)
lorenm
parents: 3482
diff changeset
848 if((for_deblock || (IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred)) && !FRAME_MBAFF)
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
849 continue;
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
850
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
851 if(USES_LIST(topleft_type, list)){
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
852 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
853 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
854 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy];
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
855 h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy];
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
856 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
857 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= 0;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
858 h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
859 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
860
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
861 if(USES_LIST(topright_type, list)){
2623
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
862 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
863 const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
864 *(uint32_t*)h->mv_cache[list][scan8[0] + 4 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy];
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
865 h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][b8_xy];
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
866 }else{
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
867 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
868 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE;
aaf8e94bce00 deblocking filter doesn't need to call fill_caches again. 1.4% faster decoding.
lorenm
parents: 2597
diff changeset
869 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
870
3519
5ef29058581e 10l in r5768 (broke mbaff)
lorenm
parents: 3482
diff changeset
871 if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF)
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
872 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
873
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
874 h->ref_cache[list][scan8[5 ]+1] =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
875 h->ref_cache[list][scan8[7 ]+1] =
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
876 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewhere else)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
877 h->ref_cache[list][scan8[4 ]] =
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
878 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
879 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
880 *(uint32_t*)h->mv_cache [list][scan8[7 ]+1]=
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
881 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
882 *(uint32_t*)h->mv_cache [list][scan8[4 ]]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
883 *(uint32_t*)h->mv_cache [list][scan8[12]]= 0;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
884
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
885 if( h->pps.cabac ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
886 /* XXX beurk, Load mvd */
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
887 if(USES_LIST(top_type, list)){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
888 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
889 *(uint32_t*)h->mvd_cache[list][scan8[0] + 0 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 0];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
890 *(uint32_t*)h->mvd_cache[list][scan8[0] + 1 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 1];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
891 *(uint32_t*)h->mvd_cache[list][scan8[0] + 2 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 2];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
892 *(uint32_t*)h->mvd_cache[list][scan8[0] + 3 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + 3];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
893 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
894 *(uint32_t*)h->mvd_cache [list][scan8[0] + 0 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
895 *(uint32_t*)h->mvd_cache [list][scan8[0] + 1 - 1*8]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
896 *(uint32_t*)h->mvd_cache [list][scan8[0] + 2 - 1*8]=
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
897 *(uint32_t*)h->mvd_cache [list][scan8[0] + 3 - 1*8]= 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
898 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
899 if(USES_LIST(left_type[0], list)){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
900 const int b_xy= h->mb2b_xy[left_xy[0]] + 3;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
901 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 0*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[0]];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
902 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 1*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[1]];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
903 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
904 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 0*8]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
905 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 1*8]= 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
906 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
907 if(USES_LIST(left_type[1], list)){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
908 const int b_xy= h->mb2b_xy[left_xy[1]] + 3;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
909 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 2*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[2]];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
910 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 + 3*8]= *(uint32_t*)h->mvd_table[list][b_xy + h->b_stride*left_block[3]];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
911 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
912 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 2*8]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
913 *(uint32_t*)h->mvd_cache [list][scan8[0] - 1 + 3*8]= 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
914 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
915 *(uint32_t*)h->mvd_cache [list][scan8[5 ]+1]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
916 *(uint32_t*)h->mvd_cache [list][scan8[7 ]+1]=
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
917 *(uint32_t*)h->mvd_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewhere else)
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
918 *(uint32_t*)h->mvd_cache [list][scan8[4 ]]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
919 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
920
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
921 if(h->slice_type == B_TYPE){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
922 fill_rectangle(&h->direct_cache[scan8[0]], 4, 4, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
923
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
924 if(IS_DIRECT(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
925 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0x01010101;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
926 }else if(IS_8X8(top_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
927 int b8_xy = h->mb2b8_xy[top_xy] + h->b8_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
928 h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
929 h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
930 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
931 *(uint32_t*)&h->direct_cache[scan8[0] - 1*8]= 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
932 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
933
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
934 if(IS_DIRECT(left_type[0]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
935 h->direct_cache[scan8[0] - 1 + 0*8]= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
936 else if(IS_8X8(left_type[0]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
937 h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[h->mb2b8_xy[left_xy[0]] + 1 + h->b8_stride*(left_block[0]>>1)];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
938 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
939 h->direct_cache[scan8[0] - 1 + 0*8]= 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
940
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
941 if(IS_DIRECT(left_type[1]))
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
942 h->direct_cache[scan8[0] - 1 + 2*8]= 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
943 else if(IS_8X8(left_type[1]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
944 h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[h->mb2b8_xy[left_xy[1]] + 1 + h->b8_stride*(left_block[2]>>1)];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
945 else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
946 h->direct_cache[scan8[0] - 1 + 2*8]= 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
947 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
948 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
949
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
950 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
951 #define MAP_MVS\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
952 MAP_F2F(scan8[0] - 1 - 1*8, topleft_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
953 MAP_F2F(scan8[0] + 0 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
954 MAP_F2F(scan8[0] + 1 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
955 MAP_F2F(scan8[0] + 2 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
956 MAP_F2F(scan8[0] + 3 - 1*8, top_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
957 MAP_F2F(scan8[0] + 4 - 1*8, topright_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
958 MAP_F2F(scan8[0] - 1 + 0*8, left_type[0])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
959 MAP_F2F(scan8[0] - 1 + 1*8, left_type[0])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
960 MAP_F2F(scan8[0] - 1 + 2*8, left_type[1])\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
961 MAP_F2F(scan8[0] - 1 + 3*8, left_type[1])
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
962 if(MB_FIELD){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
963 #define MAP_F2F(idx, mb_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
964 if(!IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
965 h->ref_cache[list][idx] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
966 h->mv_cache[list][idx][1] /= 2;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
967 h->mvd_cache[list][idx][1] /= 2;\
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
968 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
969 MAP_MVS
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
970 #undef MAP_F2F
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
971 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
972 #define MAP_F2F(idx, mb_type)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
973 if(IS_INTERLACED(mb_type) && h->ref_cache[list][idx] >= 0){\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
974 h->ref_cache[list][idx] >>= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
975 h->mv_cache[list][idx][1] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
976 h->mvd_cache[list][idx][1] <<= 1;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
977 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
978 MAP_MVS
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
979 #undef MAP_F2F
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
980 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
981 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
982 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
983 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
984 #endif
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
985
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
986 h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
987 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
988
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
989 static inline void write_back_intra_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
990 MpegEncContext * const s = &h->s;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
991 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
992
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
993 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
994 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
995 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
996 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
997 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
998 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
999 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1000 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1001
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1002 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1003 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1004 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1005 static inline int check_intra4x4_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1006 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1007 static const int8_t top [12]= {-1, 0,LEFT_DC_PRED,-1,-1,-1,-1,-1, 0};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1008 static const int8_t left[12]= { 0,-1, TOP_DC_PRED, 0,-1,-1,-1, 0,-1,DC_128_PRED};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1009 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1010
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1011 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1012 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1013 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1014 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
1015 av_log(h->s.avctx, AV_LOG_ERROR, "top block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1016 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1017 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1018 h->intra4x4_pred_mode_cache[scan8[0] + i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1019 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1020 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1021 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1022
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1023 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1024 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1025 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1026 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
1027 av_log(h->s.avctx, AV_LOG_ERROR, "left block unavailable for requested intra4x4 mode %d at %d %d\n", status, s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1028 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1029 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1030 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1031 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1032 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1033 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1034
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1035 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1036 } //FIXME cleanup like next
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1037
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1038 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1039 * checks if the top & left blocks are available if needed & changes the dc mode so it only uses the available blocks.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1040 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1041 static inline int check_intra_pred_mode(H264Context *h, int mode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1042 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1043 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1044 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8};
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1045
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
1046 if(mode < 0 || mode > 6) {
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
1047 av_log(h->s.avctx, AV_LOG_ERROR, "out of range intra chroma pred mode at %d %d\n", s->mb_x, s->mb_y);
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
1048 return -1;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
1049 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1050
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1051 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1052 mode= top[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1053 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
1054 av_log(h->s.avctx, AV_LOG_ERROR, "top block unavailable for requested intra mode at %d %d\n", s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1055 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1056 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1057 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1058
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1059 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1060 mode= left[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1061 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
1062 av_log(h->s.avctx, AV_LOG_ERROR, "left block unavailable for requested intra mode at %d %d\n", s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1063 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1064 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1065 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1066
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1067 return mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1068 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1069
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1070 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1071 * gets the predicted intra4x4 prediction mode.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1072 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1073 static inline int pred_intra_mode(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1074 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1075 const int left= h->intra4x4_pred_mode_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1076 const int top = h->intra4x4_pred_mode_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1077 const int min= FFMIN(left, top);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1078
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
1079 tprintf("mode:%d %d min:%d\n", left ,top, min);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1080
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1081 if(min<0) return DC_PRED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1082 else return min;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1083 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1084
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1085 static inline void write_back_non_zero_count(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1086 MpegEncContext * const s = &h->s;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
1087 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1088
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1089 h->non_zero_count[mb_xy][0]= h->non_zero_count_cache[7+8*1];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1090 h->non_zero_count[mb_xy][1]= h->non_zero_count_cache[7+8*2];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1091 h->non_zero_count[mb_xy][2]= h->non_zero_count_cache[7+8*3];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1092 h->non_zero_count[mb_xy][3]= h->non_zero_count_cache[7+8*4];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1093 h->non_zero_count[mb_xy][4]= h->non_zero_count_cache[4+8*4];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1094 h->non_zero_count[mb_xy][5]= h->non_zero_count_cache[5+8*4];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1095 h->non_zero_count[mb_xy][6]= h->non_zero_count_cache[6+8*4];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1096
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1097 h->non_zero_count[mb_xy][9]= h->non_zero_count_cache[1+8*2];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1098 h->non_zero_count[mb_xy][8]= h->non_zero_count_cache[2+8*2];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1099 h->non_zero_count[mb_xy][7]= h->non_zero_count_cache[2+8*1];
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1100
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1101 h->non_zero_count[mb_xy][12]=h->non_zero_count_cache[1+8*5];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
1102 h->non_zero_count[mb_xy][11]=h->non_zero_count_cache[2+8*5];
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
1103 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[2+8*4];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1104
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1105 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1106 // store all luma nnzs, for deblocking
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1107 int v = 0, i;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1108 for(i=0; i<16; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1109 v += (!!h->non_zero_count_cache[scan8[i]]) << i;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1110 *(uint16_t*)&h->non_zero_count[mb_xy][14] = v;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1111 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1112 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1113
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1114 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1115 * gets the predicted number of non zero coefficients.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1116 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1117 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1118 static inline int pred_non_zero_count(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1119 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1120 const int left= h->non_zero_count_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1121 const int top = h->non_zero_count_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1122 int i= left + top;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1123
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1124 if(i<64) i= (i+1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1125
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
1126 tprintf("pred_nnz L%X T%X n%d s%d P%X\n", left, top, n, scan8[n], i&31);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1127
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1128 return i&31;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1129 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1130
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1131 static inline int fetch_diagonal_mv(H264Context *h, const int16_t **C, int i, int list, int part_width){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1132 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1133
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1134 /* there is no consistent mapping of mvs to neighboring locations that will
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1135 * make mbaff happy, so we can't move all this logic to fill_caches */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1136 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1137 MpegEncContext *s = &h->s;
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
1138 const uint32_t *mb_types = s->current_picture_ptr->mb_type;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1139 const int16_t *mv;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1140 *(uint32_t*)h->mv_cache[list][scan8[0]-2] = 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1141 *C = h->mv_cache[list][scan8[0]-2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1142
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1143 if(!MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1144 && (s->mb_y&1) && i < scan8[0]+8 && topright_ref != PART_NOT_AVAILABLE){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1145 int topright_xy = s->mb_x + (s->mb_y-1)*s->mb_stride + (i == scan8[0]+3);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1146 if(IS_INTERLACED(mb_types[topright_xy])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1147 #define SET_DIAG_MV(MV_OP, REF_OP, X4, Y4)\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1148 const int x4 = X4, y4 = Y4;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1149 const int mb_type = mb_types[(x4>>2)+(y4>>2)*s->mb_stride];\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1150 if(!USES_LIST(mb_type,list) && !IS_8X8(mb_type))\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1151 return LIST_NOT_USED;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1152 mv = s->current_picture_ptr->motion_val[list][x4 + y4*h->b_stride];\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1153 h->mv_cache[list][scan8[0]-2][0] = mv[0];\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1154 h->mv_cache[list][scan8[0]-2][1] = mv[1] MV_OP;\
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1155 return s->current_picture_ptr->ref_index[list][(x4>>1) + (y4>>1)*h->b8_stride] REF_OP;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1156
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1157 SET_DIAG_MV(*2, >>1, s->mb_x*4+(i&7)-4+part_width, s->mb_y*4-1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1158 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1159 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1160 if(topright_ref == PART_NOT_AVAILABLE
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1161 && ((s->mb_y&1) || i >= scan8[0]+8) && (i&7)==4
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1162 && h->ref_cache[list][scan8[0]-1] != PART_NOT_AVAILABLE){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1163 if(!MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1164 && IS_INTERLACED(mb_types[h->left_mb_xy[0]])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1165 SET_DIAG_MV(*2, >>1, s->mb_x*4-1, (s->mb_y|1)*4+(s->mb_y&1)*2+(i>>4)-1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1166 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1167 if(MB_FIELD
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1168 && !IS_INTERLACED(mb_types[h->left_mb_xy[0]])
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1169 && i >= scan8[0]+8){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1170 // leftshift will turn LIST_NOT_USED into PART_NOT_AVAILABLE, but that's ok.
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1171 SET_DIAG_MV(>>1, <<1, s->mb_x*4-1, (s->mb_y&~1)*4 - 1 + ((i-scan8[0])>>3)*2);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1172 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1173 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1174 #undef SET_DIAG_MV
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1175 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1176
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1177 if(topright_ref != PART_NOT_AVAILABLE){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1178 *C= h->mv_cache[list][ i - 8 + part_width ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1179 return topright_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1180 }else{
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
1181 tprintf("topright MV not available\n");
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
1182
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1183 *C= h->mv_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1184 return h->ref_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1185 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1186 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1187
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1188 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1189 * gets the predicted MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1190 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1191 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1192 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1193 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1194 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1195 static inline void pred_motion(H264Context * const h, int n, int part_width, int list, int ref, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1196 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1197 const int top_ref= h->ref_cache[list][ index8 - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1198 const int left_ref= h->ref_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1199 const int16_t * const A= h->mv_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1200 const int16_t * const B= h->mv_cache[list][ index8 - 8 ];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1201 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1202 int diagonal_ref, match_count;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1203
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1204 assert(part_width==1 || part_width==2 || part_width==4);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1205
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1206 /* mv_cache
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1207 B . . A T T T T
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1208 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1209 U . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1210 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1211 . . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1212 */
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1213
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1214 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1215 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref);
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
1216 tprintf("pred_motion match_count=%d\n", match_count);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1217 if(match_count > 1){ //most common
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1218 *mx= mid_pred(A[0], B[0], C[0]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1219 *my= mid_pred(A[1], B[1], C[1]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1220 }else if(match_count==1){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1221 if(left_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1222 *mx= A[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1223 *my= A[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1224 }else if(top_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1225 *mx= B[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1226 *my= B[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1227 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1228 *mx= C[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1229 *my= C[1];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1230 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1231 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1232 if(top_ref == PART_NOT_AVAILABLE && diagonal_ref == PART_NOT_AVAILABLE && left_ref != PART_NOT_AVAILABLE){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1233 *mx= A[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1234 *my= A[1];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1235 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1236 *mx= mid_pred(A[0], B[0], C[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1237 *my= mid_pred(A[1], B[1], C[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1238 }
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1239 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1240
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
1241 tprintf("pred_motion (%2d %2d %2d) (%2d %2d %2d) (%2d %2d %2d) -> (%2d %2d %2d) at %2d %2d %d list %d\n", top_ref, B[0], B[1], diagonal_ref, C[0], C[1], left_ref, A[0], A[1], ref, *mx, *my, h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1242 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1243
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1244 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1245 * gets the directionally predicted 16x8 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1246 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1247 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1248 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1249 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1250 static inline void pred_16x8_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1251 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1252 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1253 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1254
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
1255 tprintf("pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n", top_ref, B[0], B[1], h->s.mb_x, h->s.mb_y, n, list);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1256
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1257 if(top_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1258 *mx= B[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1259 *my= B[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1260 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1261 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1262 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1263 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1264 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1265
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
1266 tprintf("pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d\n", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1267
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1268 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1269 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1270 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1271 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1272 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1273 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1274
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1275 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1276 pred_motion(h, n, 4, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1277 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1278
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1279 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1280 * gets the directionally predicted 8x16 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1281 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1282 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1283 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1284 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1285 static inline void pred_8x16_motion(H264Context * const h, int n, int list, int ref, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1286 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1287 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1288 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1289
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
1290 tprintf("pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n", left_ref, A[0], A[1], h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1291
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1292 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1293 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1294 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1295 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1296 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1297 }else{
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1298 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1299 int diagonal_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1300
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
1301 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1302
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
1303 tprintf("pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d\n", diagonal_ref, C[0], C[1], h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1304
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1305 if(diagonal_ref == ref){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1306 *mx= C[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1307 *my= C[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1308 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1309 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1310 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1311
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1312 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1313 pred_motion(h, n, 2, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1314 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1315
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1316 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1317 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1318 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1319
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
1320 tprintf("pred_pskip: (%d) (%d) at %2d %2d\n", top_ref, left_ref, h->s.mb_x, h->s.mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1321
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1322 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1323 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1324 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1325
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1326 *mx = *my = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1327 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1328 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1329
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1330 pred_motion(h, 0, 4, 0, 0, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1331
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1332 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1333 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1334
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1335 static inline void direct_dist_scale_factor(H264Context * const h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1336 const int poc = h->s.current_picture_ptr->poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1337 const int poc1 = h->ref_list[1][0].poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1338 int i;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1339 for(i=0; i<h->ref_count[0]; i++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1340 int poc0 = h->ref_list[0][i].poc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1341 int td = clip(poc1 - poc0, -128, 127);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1342 if(td == 0 /* FIXME || pic0 is a long-term ref */){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1343 h->dist_scale_factor[i] = 256;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1344 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1345 int tb = clip(poc - poc0, -128, 127);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1346 int tx = (16384 + (FFABS(td) >> 1)) / td;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1347 h->dist_scale_factor[i] = clip((tb*tx + 32) >> 6, -1024, 1023);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1348 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1349 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1350 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1351 for(i=0; i<h->ref_count[0]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1352 h->dist_scale_factor_field[2*i] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1353 h->dist_scale_factor_field[2*i+1] = h->dist_scale_factor[i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1354 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1355 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1356 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1357 static inline void direct_ref_list_init(H264Context * const h){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1358 MpegEncContext * const s = &h->s;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1359 Picture * const ref1 = &h->ref_list[1][0];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1360 Picture * const cur = s->current_picture_ptr;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1361 int list, i, j;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1362 if(cur->pict_type == I_TYPE)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1363 cur->ref_count[0] = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1364 if(cur->pict_type != B_TYPE)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1365 cur->ref_count[1] = 0;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1366 for(list=0; list<2; list++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1367 cur->ref_count[list] = h->ref_count[list];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1368 for(j=0; j<h->ref_count[list]; j++)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1369 cur->ref_poc[list][j] = h->ref_list[list][j].poc;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1370 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1371 if(cur->pict_type != B_TYPE || h->direct_spatial_mv_pred)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1372 return;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1373 for(list=0; list<2; list++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1374 for(i=0; i<ref1->ref_count[list]; i++){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1375 const int poc = ref1->ref_poc[list][i];
3125
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
1376 h->map_col_to_list0[list][i] = 0; /* bogus; fills in for missing frames */
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1377 for(j=0; j<h->ref_count[list]; j++)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1378 if(h->ref_list[list][j].poc == poc){
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1379 h->map_col_to_list0[list][i] = j;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1380 break;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1381 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1382 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1383 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1384 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1385 for(list=0; list<2; list++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1386 for(i=0; i<ref1->ref_count[list]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1387 j = h->map_col_to_list0[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1388 h->map_col_to_list0_field[list][2*i] = 2*j;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1389 h->map_col_to_list0_field[list][2*i+1] = 2*j+1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1390 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1391 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1392 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1393 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1394
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1395 static inline void pred_direct_motion(H264Context * const h, int *mb_type){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1396 MpegEncContext * const s = &h->s;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1397 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1398 const int b8_xy = 2*s->mb_x + 2*s->mb_y*h->b8_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1399 const int b4_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1400 const int mb_type_col = h->ref_list[1][0].mb_type[mb_xy];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1401 const int16_t (*l1mv0)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[0][b4_xy];
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1402 const int16_t (*l1mv1)[2] = (const int16_t (*)[2]) &h->ref_list[1][0].motion_val[1][b4_xy];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1403 const int8_t *l1ref0 = &h->ref_list[1][0].ref_index[0][b8_xy];
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1404 const int8_t *l1ref1 = &h->ref_list[1][0].ref_index[1][b8_xy];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1405 const int is_b8x8 = IS_8X8(*mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1406 int sub_mb_type;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1407 int i8, i4;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1408
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1409 #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM)
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1410 if(IS_8X8(mb_type_col) && !h->sps.direct_8x8_inference_flag){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1411 /* FIXME save sub mb types from previous frames (or derive from MVs)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1412 * so we know exactly what block size to use */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1413 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */
2536
943b0615fc93 oops, other half of the vismv patch
lorenm
parents: 2535
diff changeset
1414 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1415 }else if(!is_b8x8 && (mb_type_col & MB_TYPE_16x16_OR_INTRA)){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1416 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1417 *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1418 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1419 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
2536
943b0615fc93 oops, other half of the vismv patch
lorenm
parents: 2535
diff changeset
1420 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1421 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1422 if(!is_b8x8)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1423 *mb_type |= MB_TYPE_DIRECT2;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1424 if(MB_FIELD)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1425 *mb_type |= MB_TYPE_INTERLACED;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1426
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
1427 tprintf("mb_type = %08x, sub_mb_type = %08x, is_b8x8 = %d, mb_type_col = %08x\n", *mb_type, sub_mb_type, is_b8x8, mb_type_col);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1428
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1429 if(h->direct_spatial_mv_pred){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1430 int ref[2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1431 int mv[2][2];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1432 int list;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1433
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1434 /* FIXME interlacing + spatial direct uses wrong colocated block positions */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1435
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1436 /* ref = min(neighbors) */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1437 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1438 int refa = h->ref_cache[list][scan8[0] - 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1439 int refb = h->ref_cache[list][scan8[0] - 8];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1440 int refc = h->ref_cache[list][scan8[0] - 8 + 4];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1441 if(refc == -2)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1442 refc = h->ref_cache[list][scan8[0] - 8 - 1];
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1443 ref[list] = refa;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1444 if(ref[list] < 0 || (refb < ref[list] && refb >= 0))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1445 ref[list] = refb;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1446 if(ref[list] < 0 || (refc < ref[list] && refc >= 0))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1447 ref[list] = refc;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1448 if(ref[list] < 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1449 ref[list] = -1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1450 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1451
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1452 if(ref[0] < 0 && ref[1] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1453 ref[0] = ref[1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1454 mv[0][0] = mv[0][1] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1455 mv[1][0] = mv[1][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1456 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1457 for(list=0; list<2; list++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1458 if(ref[list] >= 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1459 pred_motion(h, 0, 4, list, ref[list], &mv[list][0], &mv[list][1]);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1460 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1461 mv[list][0] = mv[list][1] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1462 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1463 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1464
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1465 if(ref[1] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1466 *mb_type &= ~MB_TYPE_P0L1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1467 sub_mb_type &= ~MB_TYPE_P0L1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1468 }else if(ref[0] < 0){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1469 *mb_type &= ~MB_TYPE_P0L0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1470 sub_mb_type &= ~MB_TYPE_P0L0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1471 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1472
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1473 if(IS_16X16(*mb_type)){
3001
b52d8ee430f6 fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents: 2979
diff changeset
1474 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, (uint8_t)ref[0], 1);
b52d8ee430f6 fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents: 2979
diff changeset
1475 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, (uint8_t)ref[1], 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1476 if(!IS_INTRA(mb_type_col)
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1477 && ( (l1ref0[0] == 0 && FFABS(l1mv0[0][0]) <= 1 && FFABS(l1mv0[0][1]) <= 1)
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1478 || (l1ref0[0] < 0 && l1ref1[0] == 0 && FFABS(l1mv1[0][0]) <= 1 && FFABS(l1mv1[0][1]) <= 1
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1479 && (h->x264_build>33 || !h->x264_build)))){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1480 if(ref[0] > 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1481 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1482 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1483 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1484 if(ref[1] > 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1485 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1486 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1487 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1488 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1489 fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv[0][0],mv[0][1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1490 fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv[1][0],mv[1][1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1491 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1492 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1493 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1494 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1495 const int y8 = i8>>1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1496
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1497 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1498 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1499 h->sub_mb_type[i8] = sub_mb_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1500
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1501 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mv[0][0],mv[0][1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1502 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mv[1][0],mv[1][1]), 4);
3001
b52d8ee430f6 fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents: 2979
diff changeset
1503 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[0], 1);
b52d8ee430f6 fix some potential arithmetic overflows in pred_direct_motion() and
lorenm
parents: 2979
diff changeset
1504 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, (uint8_t)ref[1], 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1505
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1506 /* col_zero_flag */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1507 if(!IS_INTRA(mb_type_col) && ( l1ref0[x8 + y8*h->b8_stride] == 0
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1508 || (l1ref0[x8 + y8*h->b8_stride] < 0 && l1ref1[x8 + y8*h->b8_stride] == 0
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1509 && (h->x264_build>33 || !h->x264_build)))){
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1510 const int16_t (*l1mv)[2]= l1ref0[x8 + y8*h->b8_stride] == 0 ? l1mv0 : l1mv1;
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1511 if(IS_SUB_8X8(sub_mb_type)){
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1512 const int16_t *mv_col = l1mv[x8*3 + y8*3*h->b_stride];
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1513 if(FFABS(mv_col[0]) <= 1 && FFABS(mv_col[1]) <= 1){
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1514 if(ref[0] == 0)
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1515 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4);
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1516 if(ref[1] == 0)
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1517 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4);
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1518 }
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1519 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1520 for(i4=0; i4<4; i4++){
2808
932ec96933f5 fixing colocated mv if colocated block is L1 predicted
michael
parents: 2803
diff changeset
1521 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride];
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
1522 if(FFABS(mv_col[0]) <= 1 && FFABS(mv_col[1]) <= 1){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1523 if(ref[0] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1524 *(uint32_t*)h->mv_cache[0][scan8[i8*4+i4]] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1525 if(ref[1] == 0)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1526 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] = 0;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1527 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1528 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1529 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1530 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1531 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1532 }else{ /* direct temporal mv pred */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1533 const int *map_col_to_list0[2] = {h->map_col_to_list0[0], h->map_col_to_list0[1]};
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1534 const int *dist_scale_factor = h->dist_scale_factor;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1535
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1536 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1537 if(IS_INTERLACED(*mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1538 map_col_to_list0[0] = h->map_col_to_list0_field[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1539 map_col_to_list0[1] = h->map_col_to_list0_field[1];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1540 dist_scale_factor = h->dist_scale_factor_field;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1541 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1542 if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1543 /* FIXME assumes direct_8x8_inference == 1 */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1544 const int pair_xy = s->mb_x + (s->mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1545 int mb_types_col[2];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1546 int y_shift;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1547
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1548 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1549 | (is_b8x8 ? 0 : MB_TYPE_DIRECT2)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1550 | (*mb_type & MB_TYPE_INTERLACED);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1551 sub_mb_type = MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_16x16;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1552
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1553 if(IS_INTERLACED(*mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1554 /* frame to field scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1555 mb_types_col[0] = h->ref_list[1][0].mb_type[pair_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1556 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1557 if(s->mb_y&1){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1558 l1ref0 -= 2*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1559 l1ref1 -= 2*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1560 l1mv0 -= 4*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1561 l1mv1 -= 4*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1562 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1563 y_shift = 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1564
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1565 if( (mb_types_col[0] & MB_TYPE_16x16_OR_INTRA)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1566 && (mb_types_col[1] & MB_TYPE_16x16_OR_INTRA)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1567 && !is_b8x8)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1568 *mb_type |= MB_TYPE_16x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1569 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1570 *mb_type |= MB_TYPE_8x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1571 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1572 /* field to frame scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1573 /* col_mb_y = (mb_y&~1) + (topAbsDiffPOC < bottomAbsDiffPOC ? 0 : 1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1574 * but in MBAFF, top and bottom POC are equal */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1575 int dy = (s->mb_y&1) ? 1 : 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1576 mb_types_col[0] =
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1577 mb_types_col[1] = h->ref_list[1][0].mb_type[pair_xy+s->mb_stride];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1578 l1ref0 += dy*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1579 l1ref1 += dy*h->b8_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1580 l1mv0 += 2*dy*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1581 l1mv1 += 2*dy*h->b_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1582 y_shift = 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1583
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1584 if((mb_types_col[0] & (MB_TYPE_16x16_OR_INTRA|MB_TYPE_16x8))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1585 && !is_b8x8)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1586 *mb_type |= MB_TYPE_16x16;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1587 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1588 *mb_type |= MB_TYPE_8x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1589 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1590
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1591 for(i8=0; i8<4; i8++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1592 const int x8 = i8&1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1593 const int y8 = i8>>1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1594 int ref0, scale;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1595 const int16_t (*l1mv)[2]= l1mv0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1596
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1597 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1598 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1599 h->sub_mb_type[i8] = sub_mb_type;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1600
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1601 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1602 if(IS_INTRA(mb_types_col[y8])){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1603 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1604 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1605 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1606 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1607 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1608
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1609 ref0 = l1ref0[x8 + (y8*2>>y_shift)*h->b8_stride];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1610 if(ref0 >= 0)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1611 ref0 = map_col_to_list0[0][ref0*2>>y_shift];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1612 else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1613 ref0 = map_col_to_list0[1][l1ref1[x8 + (y8*2>>y_shift)*h->b8_stride]*2>>y_shift];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1614 l1mv= l1mv1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1615 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1616 scale = dist_scale_factor[ref0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1617 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1618
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1619 {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1620 const int16_t *mv_col = l1mv[x8*3 + (y8*6>>y_shift)*h->b_stride];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1621 int my_col = (mv_col[1]<<y_shift)/2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1622 int mx = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1623 int my = (scale * my_col + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1624 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1625 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-my_col), 4);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1626 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1627 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1628 return;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1629 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1630 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1631
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1632 /* one-to-one mv scaling */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1633
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1634 if(IS_16X16(*mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1635 fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1636 if(IS_INTRA(mb_type_col)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1637 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1638 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1639 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1640 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1641 const int ref0 = l1ref0[0] >= 0 ? map_col_to_list0[0][l1ref0[0]]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1642 : map_col_to_list0[1][l1ref1[0]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1643 const int scale = dist_scale_factor[ref0];
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1644 const int16_t *mv_col = l1ref0[0] >= 0 ? l1mv0[0] : l1mv1[0];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1645 int mv_l0[2];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1646 mv_l0[0] = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1647 mv_l0[1] = (scale * mv_col[1] + 128) >> 8;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1648 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1649 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mv_l0[0],mv_l0[1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1650 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1651 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1652 }else{
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1653 for(i8=0; i8<4; i8++){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1654 const int x8 = i8&1;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1655 const int y8 = i8>>1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1656 int ref0, scale;
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
1657 const int16_t (*l1mv)[2]= l1mv0;
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1658
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1659 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1660 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1661 h->sub_mb_type[i8] = sub_mb_type;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1662 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1663 if(IS_INTRA(mb_type_col)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1664 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1665 fill_rectangle(&h-> mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1666 fill_rectangle(&h-> mv_cache[1][scan8[i8*4]], 2, 2, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1667 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1668 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1669
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1670 ref0 = l1ref0[x8 + y8*h->b8_stride];
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
1671 if(ref0 >= 0)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1672 ref0 = map_col_to_list0[0][ref0];
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1673 else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1674 ref0 = map_col_to_list0[1][l1ref1[x8 + y8*h->b8_stride]];
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1675 l1mv= l1mv1;
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1676 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1677 scale = dist_scale_factor[ref0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1678
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1679 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1);
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1680 if(IS_SUB_8X8(sub_mb_type)){
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1681 const int16_t *mv_col = l1mv[x8*3 + y8*3*h->b_stride];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1682 int mx = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1683 int my = (scale * mv_col[1] + 128) >> 8;
3002
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1684 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, pack16to32(mx,my), 4);
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1685 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, pack16to32(mx-mv_col[0],my-mv_col[1]), 4);
68d252a8ecd2 fix direct_8x8_inference_flag with 4x4 mvs.
lorenm
parents: 3001
diff changeset
1686 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1687 for(i4=0; i4<4; i4++){
2809
75400dfbe117 fixing colocated mv if colocated block is L1 predicted for the temporal direct case
michael
parents: 2808
diff changeset
1688 const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*h->b_stride];
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1689 int16_t *mv_l0 = h->mv_cache[0][scan8[i8*4+i4]];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1690 mv_l0[0] = (scale * mv_col[0] + 128) >> 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
1691 mv_l0[1] = (scale * mv_col[1] + 128) >> 8;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1692 *(uint32_t*)h->mv_cache[1][scan8[i8*4+i4]] =
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1693 pack16to32(mv_l0[0]-mv_col[0],mv_l0[1]-mv_col[1]);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1694 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1695 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1696 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1697 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1698 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1699
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1700 static inline void write_back_motion(H264Context *h, int mb_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1701 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1702 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1703 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1704 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1705
3219
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1706 if(!USES_LIST(mb_type, 0))
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1707 fill_rectangle(&s->current_picture.ref_index[0][b8_xy], 2, 2, h->b8_stride, (uint8_t)LIST_NOT_USED, 1);
cf233efbcece 10l in 1.199 (write_back_motion with B-pyramid + spatial)
lorenm
parents: 3215
diff changeset
1708
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1709 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1710 int y;
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1711 if(!USES_LIST(mb_type, list))
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1712 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1713
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1714 for(y=0; y<4; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1715 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]= *(uint64_t*)h->mv_cache[list][scan8[0]+0 + 8*y];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1716 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mv_cache[list][scan8[0]+2 + 8*y];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1717 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1718 if( h->pps.cabac ) {
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1719 if(IS_SKIP(mb_type))
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1720 fill_rectangle(h->mvd_table[list][b_xy], 4, 4, h->b_stride, 0, 4);
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
1721 else
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1722 for(y=0; y<4; y++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1723 *(uint64_t*)h->mvd_table[list][b_xy + 0 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+0 + 8*y];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1724 *(uint64_t*)h->mvd_table[list][b_xy + 2 + y*h->b_stride]= *(uint64_t*)h->mvd_cache[list][scan8[0]+2 + 8*y];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1725 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1726 }
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1727
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1728 {
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3651
diff changeset
1729 int8_t *ref_index = &s->current_picture.ref_index[list][b8_xy];
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1730 ref_index[0+0*h->b8_stride]= h->ref_cache[list][scan8[0]];
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1731 ref_index[1+0*h->b8_stride]= h->ref_cache[list][scan8[4]];
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1732 ref_index[0+1*h->b8_stride]= h->ref_cache[list][scan8[8]];
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1733 ref_index[1+1*h->b8_stride]= h->ref_cache[list][scan8[12]];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1734 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1735 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1736
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1737 if(h->slice_type == B_TYPE && h->pps.cabac){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1738 if(IS_8X8(mb_type)){
3212
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1739 uint8_t *direct_table = &h->direct_table[b8_xy];
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1740 direct_table[1+0*h->b8_stride] = IS_DIRECT(h->sub_mb_type[1]) ? 1 : 0;
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1741 direct_table[0+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[2]) ? 1 : 0;
5fb704618ec4 1.5x faster write_back_motion, 1-3% overall
lorenm
parents: 3196
diff changeset
1742 direct_table[1+1*h->b8_stride] = IS_DIRECT(h->sub_mb_type[3]) ? 1 : 0;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1743 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
1744 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1745 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1746
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1747 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1748 * Decodes a network abstraction layer unit.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1749 * @param consumed is the number of bytes used as input
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1750 * @param length is the length of the array
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
1751 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp tailing?
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1752 * @returns decoded bytes, might be src+1 if no escapes
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1753 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1754 static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *consumed, int length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1755 int i, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1756 uint8_t *dst;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1757
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
1758 // src[0]&0x80; //forbidden bit
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1759 h->nal_ref_idc= src[0]>>5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1760 h->nal_unit_type= src[0]&0x1F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1761
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1762 src++; length--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1763 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1764 for(i=0; i<length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1765 printf("%2X ", src[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1766 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1767 for(i=0; i+1<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1768 if(src[i]) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1769 if(i>0 && src[i-1]==0) i--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1770 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1771 if(src[i+2]!=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1772 /* startcode, so we must be past the end */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1773 length=i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1774 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1775 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1776 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1777 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1778
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1779 if(i>=length-1){ //no escaped 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1780 *dst_length= length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1781 *consumed= length+1; //+1 for the header
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1782 return src;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1783 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1784
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1785 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1786 dst= h->rbsp_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1787
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
1788 //printf("decoding esc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1789 si=di=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1790 while(si<length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1791 //remove escapes (very rare 1:2^22)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1792 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1793 if(src[si+2]==3){ //escape
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1794 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1795 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1796 si+=3;
1957
54411768fa38 h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1956
diff changeset
1797 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1798 }else //next start code
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1799 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1800 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1801
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1802 dst[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1803 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1804
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1805 *dst_length= di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1806 *consumed= si + 1;//+1 for the header
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1807 //FIXME store exact number of bits in the getbitcontext (its needed for decoding)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1808 return dst;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1809 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1810
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1811 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1812 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1813 * @param src the data which should be escaped
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1814 * @param dst the target buffer, dst+1 == src is allowed as a special case
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1815 * @param length the length of the src data
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1816 * @param dst_length the length of the dst array
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1817 * @returns length of escaped data in bytes or -1 if an error occured
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1818 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1819 static int encode_nal(H264Context *h, uint8_t *dst, uint8_t *src, int length, int dst_length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1820 int i, escape_count, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1821 uint8_t *temp;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1822
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1823 assert(length>=0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1824 assert(dst_length>0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1825
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1826 dst[0]= (h->nal_ref_idc<<5) + h->nal_unit_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1827
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1828 if(length==0) return 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1829
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1830 escape_count= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1831 for(i=0; i<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1832 if(src[i]) continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1833 if(i>0 && src[i-1]==0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1834 i--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1835 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1836 escape_count++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1837 i+=2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1838 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1839 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1840
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1841 if(escape_count==0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1842 if(dst+1 != src)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1843 memcpy(dst+1, src, length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1844 return length + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1845 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1846
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1847 if(length + escape_count + 1> dst_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1848 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1849
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1850 //this should be damn rare (hopefully)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1851
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1852 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length + escape_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1853 temp= h->rbsp_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1854 //printf("encoding esc\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1855
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1856 si= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1857 di= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1858 while(si < length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1859 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1860 temp[di++]= 0; si++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1861 temp[di++]= 0; si++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1862 temp[di++]= 3;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1863 temp[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1864 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1865 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1866 temp[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1867 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1868 memcpy(dst+1, temp, length+escape_count);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1869
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1870 assert(di == length+escape_count);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
1871
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1872 return di + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1873 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1874
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1875 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1876 * write 1,10,100,1000,... for alignment, yes its exactly inverse to mpeg4
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1877 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1878 static void encode_rbsp_trailing(PutBitContext *pb){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1879 int length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1880 put_bits(pb, 1, 1);
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1754
diff changeset
1881 length= (-put_bits_count(pb))&7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1882 if(length) put_bits(pb, length, 0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1883 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1884 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1885
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1886 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1887 * identifies the exact end of the bitstream
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1888 * @return the length of the trailing, or 0 if damaged
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1889 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1890 static int decode_rbsp_trailing(uint8_t *src){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1891 int v= *src;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1892 int r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1893
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
1894 tprintf("rbsp trailing %X\n", v);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1895
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1896 for(r=1; r<9; r++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1897 if(v&1) return r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1898 v>>=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1899 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1900 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1901 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1902
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1903 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1904 * idct tranforms the 16 dc values and dequantize them.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1905 * @param qp quantization parameter
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1906 */
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1907 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1908 #define stride 16
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1909 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1910 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1911 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1912 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1913
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1914 //memset(block, 64, 2*256);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1915 //return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1916 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1917 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1918 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1919 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1920 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1921 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1922
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1923 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1924 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1925 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1926 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1927 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1928
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1929 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1930 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1931 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1932 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1933 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1934 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1935
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1936 block[stride*0 +offset]= ((((z0 + z3)*qmul + 128 ) >> 8)); //FIXME think about merging this into decode_resdual
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1937 block[stride*2 +offset]= ((((z1 + z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1938 block[stride*8 +offset]= ((((z1 - z2)*qmul + 128 ) >> 8));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1939 block[stride*10+offset]= ((((z0 - z3)*qmul + 128 ) >> 8));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1940 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1941 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1942
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1943 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1944 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1945 * dct tranforms the 16 dc values.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1946 * @param qp quantization parameter ??? FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1947 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1948 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1949 // const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1950 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1951 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1952 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1953 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1954
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1955 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1956 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1957 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1958 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1959 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1960 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1961
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1962 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1963 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1964 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1965 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1966 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1967
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1968 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1969 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1970 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1971 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1972 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1973 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1974
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1975 block[stride*0 +offset]= (z0 + z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1976 block[stride*2 +offset]= (z1 + z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1977 block[stride*8 +offset]= (z1 - z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1978 block[stride*10+offset]= (z0 - z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1979 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1980 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1981 #endif
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1982
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1983 #undef xStride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1984 #undef stride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1985
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
1986 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp, int qmul){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1987 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1988 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1989 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1990
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1991 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1992 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1993 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1994 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1995
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1996 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1997 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1998 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1999 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2000
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2001 block[stride*0 + xStride*0]= ((a+c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2002 block[stride*0 + xStride*1]= ((e+b)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2003 block[stride*1 + xStride*0]= ((a-c)*qmul) >> 7;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
2004 block[stride*1 + xStride*1]= ((e-b)*qmul) >> 7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2005 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2006
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2007 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2008 static void chroma_dc_dct_c(DCTELEM *block){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2009 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2010 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2011 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2012
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2013 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2014 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2015 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2016 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2017
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2018 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2019 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2020 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2021 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2022
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2023 block[stride*0 + xStride*0]= (a+c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2024 block[stride*0 + xStride*1]= (e+b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2025 block[stride*1 + xStride*0]= (a-c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2026 block[stride*1 + xStride*1]= (e-b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2027 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2028 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2029
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2030 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2031 * gets the chroma qp.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2032 */
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2033 static inline int get_chroma_qp(int chroma_qp_index_offset, int qscale){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2034
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
2035 return chroma_qp[clip(qscale + chroma_qp_index_offset, 0, 51)];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2036 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2037
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2038
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2039 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2040 static void h264_diff_dct_c(DCTELEM *block, uint8_t *src1, uint8_t *src2, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2041 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2042 //FIXME try int temp instead of block
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2043
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2044 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2045 const int d0= src1[0 + i*stride] - src2[0 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2046 const int d1= src1[1 + i*stride] - src2[1 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2047 const int d2= src1[2 + i*stride] - src2[2 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2048 const int d3= src1[3 + i*stride] - src2[3 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2049 const int z0= d0 + d3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2050 const int z3= d0 - d3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2051 const int z1= d1 + d2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2052 const int z2= d1 - d2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2053
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2054 block[0 + 4*i]= z0 + z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2055 block[1 + 4*i]= 2*z3 + z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2056 block[2 + 4*i]= z0 - z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2057 block[3 + 4*i]= z3 - 2*z2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2058 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2059
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2060 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2061 const int z0= block[0*4 + i] + block[3*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2062 const int z3= block[0*4 + i] - block[3*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2063 const int z1= block[1*4 + i] + block[2*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2064 const int z2= block[1*4 + i] - block[2*4 + i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2065
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2066 block[0*4 + i]= z0 + z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2067 block[1*4 + i]= 2*z3 + z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2068 block[2*4 + i]= z0 - z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2069 block[3*4 + i]= z3 - 2*z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2070 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2071 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2072 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2073
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
2074 //FIXME need to check that this doesnt overflow signed 32 bit for low qp, i am not sure, it's very close
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2075 //FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2076 static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int seperate_dc){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2077 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2078 const int * const quant_table= quant_coeff[qscale];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2079 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2080 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2081 const unsigned int threshold2= (threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2082 int last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2083
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2084 if(seperate_dc){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2085 if(qscale<=18){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2086 //avoid overflows
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2087 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2088 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2089 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2090
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2091 int level= block[0]*quant_coeff[qscale+18][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2092 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2093 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2094 level= (dc_bias + level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2095 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2096 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2097 level= (dc_bias - level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2098 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2099 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2100 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2101 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2102 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2103 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2104 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2105 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2106 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2107 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2108
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2109 int level= block[0]*quant_table[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2110 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2111 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2112 level= (dc_bias + level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2113 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2114 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2115 level= (dc_bias - level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2116 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2117 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2118 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2119 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2120 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2121 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2122 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2123 last_non_zero= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2124 i=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2125 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2126 last_non_zero= -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2127 i=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2128 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2129
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2130 for(; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2131 const int j= scantable[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2132 int level= block[j]*quant_table[j];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2133
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2134 // if( bias+level >= (1<<(QMAT_SHIFT - 3))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2135 // || bias-level >= (1<<(QMAT_SHIFT - 3))){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2136 if(((unsigned)(level+threshold1))>threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2137 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2138 level= (bias + level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2139 block[j]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2140 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2141 level= (bias - level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2142 block[j]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2143 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2144 last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2145 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2146 block[j]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2147 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2148 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2149
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2150 return last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2151 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2152
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2153 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2154 const uint32_t a= ((uint32_t*)(src-stride))[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2155 ((uint32_t*)(src+0*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2156 ((uint32_t*)(src+1*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2157 ((uint32_t*)(src+2*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2158 ((uint32_t*)(src+3*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2159 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2160
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2161 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2162 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2163 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2164 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2165 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2166 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2167
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2168 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2169 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride]
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2170 + src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 4) >>3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2171
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2172 ((uint32_t*)(src+0*stride))[0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2173 ((uint32_t*)(src+1*stride))[0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2174 ((uint32_t*)(src+2*stride))[0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2175 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2176 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2177
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2178 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2179 const int dc= ( src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 2) >>2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2180
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2181 ((uint32_t*)(src+0*stride))[0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2182 ((uint32_t*)(src+1*stride))[0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2183 ((uint32_t*)(src+2*stride))[0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2184 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2185 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2186
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2187 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2188 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2189
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2190 ((uint32_t*)(src+0*stride))[0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2191 ((uint32_t*)(src+1*stride))[0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2192 ((uint32_t*)(src+2*stride))[0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2193 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2194 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2195
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2196 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2197 ((uint32_t*)(src+0*stride))[0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2198 ((uint32_t*)(src+1*stride))[0]=
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2199 ((uint32_t*)(src+2*stride))[0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2200 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2201 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2202
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2203
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2204 #define LOAD_TOP_RIGHT_EDGE\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2205 const int t4= topright[0];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2206 const int t5= topright[1];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2207 const int t6= topright[2];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2208 const int t7= topright[3];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2209
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2210 #define LOAD_LEFT_EDGE\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2211 const int l0= src[-1+0*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2212 const int l1= src[-1+1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2213 const int l2= src[-1+2*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2214 const int l3= src[-1+3*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2215
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2216 #define LOAD_TOP_EDGE\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2217 const int t0= src[ 0-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2218 const int t1= src[ 1-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2219 const int t2= src[ 2-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2220 const int t3= src[ 3-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2221
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2222 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2223 const int lt= src[-1-1*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2224 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2225 LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2226
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2227 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2228 src[0+2*stride]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2229 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2230 src[0+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2231 src[1+2*stride]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2232 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2233 src[0+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2234 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2235 src[2+2*stride]=
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2236 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2237 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2238 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2239 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2240 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2241 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2242 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
2243 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2244
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2245 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2246 LOAD_TOP_EDGE
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2247 LOAD_TOP_RIGHT_EDGE
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2248 // LOAD_LEFT_EDGE
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2249
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2250 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2251 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2252 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2253 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2254 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2255 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2256 src[3+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2257 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2258 src[1+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2259 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2260 src[3+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2261 src[2+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2262 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2263 src[3+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2264 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2265 src[3+3*stride]=(t6 + 3*t7 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
2266 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2267
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2268 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2269 const int lt= src[-1-1*stride];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2270 LOAD_TOP_EDGE
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2271 LOAD_LEFT_EDGE
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2272 const __attribute__((unused)) int unu= l3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2273
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2274 src[0+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2275 src[1+2*stride]=(lt + t0 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2276 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2277 src[2+2*stride]=(t0 + t1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2278 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2279 src[3+2*stride]=(t1 + t2 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2280 src[3+0*stride]=(t2 + t3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2281 src[0+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2282 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2283 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2284 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2285 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2286 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2287 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2288 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2289 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
2290 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2291
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2292 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2293 LOAD_TOP_EDGE
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2294 LOAD_TOP_RIGHT_EDGE
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2295 const __attribute__((unused)) int unu= t7;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2296
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2297 src[0+0*stride]=(t0 + t1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2298 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2299 src[0+2*stride]=(t1 + t2 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2300 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2301 src[1+2*stride]=(t2 + t3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2302 src[3+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2303 src[2+2*stride]=(t3 + t4+ 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2304 src[3+2*stride]=(t4 + t5+ 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2305 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2306 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2307 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2308 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2309 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2310 src[3+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2311 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2312 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
2313 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2314
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2315 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2316 LOAD_LEFT_EDGE
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2317
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2318 src[0+0*stride]=(l0 + l1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2319 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2320 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2321 src[0+1*stride]=(l1 + l2 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2322 src[3+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2323 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2324 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2325 src[0+2*stride]=(l2 + l3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2326 src[3+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2327 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2328 src[3+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2329 src[1+3*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2330 src[0+3*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2331 src[2+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2332 src[2+3*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2333 src[3+3*stride]=l3;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
2334 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2335
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2336 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2337 const int lt= src[-1-1*stride];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2338 LOAD_TOP_EDGE
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2339 LOAD_LEFT_EDGE
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2340 const __attribute__((unused)) int unu= t3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2341
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2342 src[0+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2343 src[2+1*stride]=(lt + l0 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2344 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2345 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2346 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2347 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2348 src[0+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2349 src[2+2*stride]=(l0 + l1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2350 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2351 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2352 src[0+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2353 src[2+3*stride]=(l1 + l2+ 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2354 src[1+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2355 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2356 src[0+3*stride]=(l2 + l3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2357 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
2358 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2359
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2360 static void pred16x16_vertical_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2361 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2362 const uint32_t a= ((uint32_t*)(src-stride))[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2363 const uint32_t b= ((uint32_t*)(src-stride))[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2364 const uint32_t c= ((uint32_t*)(src-stride))[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2365 const uint32_t d= ((uint32_t*)(src-stride))[3];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2366
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2367 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2368 ((uint32_t*)(src+i*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2369 ((uint32_t*)(src+i*stride))[1]= b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2370 ((uint32_t*)(src+i*stride))[2]= c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2371 ((uint32_t*)(src+i*stride))[3]= d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2372 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2373 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2374
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2375 static void pred16x16_horizontal_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2376 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2377
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2378 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2379 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2380 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2381 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2382 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2383 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2384 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2385
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2386 static void pred16x16_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2387 int i, dc=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2388
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2389 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2390 dc+= src[-1+i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2391 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2392
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2393 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2394 dc+= src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2395 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2396
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2397 dc= 0x01010101*((dc + 16)>>5);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2398
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2399 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2400 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2401 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2402 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2403 ((uint32_t*)(src+i*stride))[3]= dc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2404 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2405 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2406
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2407 static void pred16x16_left_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2408 int i, dc=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2409
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2410 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2411 dc+= src[-1+i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2412 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2413
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2414 dc= 0x01010101*((dc + 8)>>4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2415
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2416 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2417 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2418 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2419 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2420 ((uint32_t*)(src+i*stride))[3]= dc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2421 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2422 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2423
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2424 static void pred16x16_top_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2425 int i, dc=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2426
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2427 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2428 dc+= src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2429 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2430 dc= 0x01010101*((dc + 8)>>4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2431
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2432 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2433 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2434 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2435 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2436 ((uint32_t*)(src+i*stride))[3]= dc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2437 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2438 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2439
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2440 static void pred16x16_128_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2441 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2442
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2443 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2444 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2445 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2446 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2447 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2448 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2449 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2450
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2451 static inline void pred16x16_plane_compat_c(uint8_t *src, int stride, const int svq3){
1184
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2452 int i, j, k;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2453 int a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2454 uint8_t *cm = cropTbl + MAX_NEG_CROP;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2455 const uint8_t * const src0 = src+7-stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2456 const uint8_t *src1 = src+8*stride-1;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2457 const uint8_t *src2 = src1-2*stride; // == src+6*stride-1;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2458 int H = src0[1] - src0[-1];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2459 int V = src1[0] - src2[ 0];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2460 for(k=2; k<=8; ++k) {
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2461 src1 += stride; src2 -= stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2462 H += k*(src0[k] - src0[-k]);
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2463 V += k*(src1[0] - src2[ 0]);
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2464 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2465 if(svq3){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2466 H = ( 5*(H/4) ) / 16;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2467 V = ( 5*(V/4) ) / 16;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1322
diff changeset
2468
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1322
diff changeset
2469 /* required for 100% accuracy */
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1322
diff changeset
2470 i = H; H = V; V = i;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2471 }else{
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2472 H = ( 5*H+32 ) >> 6;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2473 V = ( 5*V+32 ) >> 6;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2474 }
1184
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2475
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2476 a = 16*(src1[0] + src2[16] + 1) - 7*(V+H);
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2477 for(j=16; j>0; --j) {
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2478 int b = a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2479 a += V;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2480 for(i=-16; i<0; i+=4) {
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2481 src[16+i] = cm[ (b ) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2482 src[17+i] = cm[ (b+ H) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2483 src[18+i] = cm[ (b+2*H) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2484 src[19+i] = cm[ (b+3*H) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2485 b += 4*H;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2486 }
1184
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2487 src += stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2488 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2489 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2490
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2491 static void pred16x16_plane_c(uint8_t *src, int stride){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2492 pred16x16_plane_compat_c(src, stride, 0);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2493 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2494
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2495 static void pred8x8_vertical_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2496 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2497 const uint32_t a= ((uint32_t*)(src-stride))[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2498 const uint32_t b= ((uint32_t*)(src-stride))[1];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2499
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2500 for(i=0; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2501 ((uint32_t*)(src+i*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2502 ((uint32_t*)(src+i*stride))[1]= b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2503 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2504 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2505
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2506 static void pred8x8_horizontal_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2507 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2508
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2509 for(i=0; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2510 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2511 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2512 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2513 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2514
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2515 static void pred8x8_128_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2516 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2517
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2518 for(i=0; i<8; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2519 ((uint32_t*)(src+i*stride))[0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2520 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2521 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2522 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2523
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2524 static void pred8x8_left_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2525 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2526 int dc0, dc2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2527
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2528 dc0=dc2=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2529 for(i=0;i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2530 dc0+= src[-1+i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2531 dc2+= src[-1+(i+4)*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2532 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2533 dc0= 0x01010101*((dc0 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2534 dc2= 0x01010101*((dc2 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2535
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2536 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2537 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2538 ((uint32_t*)(src+i*stride))[1]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2539 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2540 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2541 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2542 ((uint32_t*)(src+i*stride))[1]= dc2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2543 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2544 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2545
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2546 static void pred8x8_top_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2547 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2548 int dc0, dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2549
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2550 dc0=dc1=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2551 for(i=0;i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2552 dc0+= src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2553 dc1+= src[4+i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2554 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2555 dc0= 0x01010101*((dc0 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2556 dc1= 0x01010101*((dc1 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2557
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2558 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2559 ((uint32_t*)(src+i*stride))[0]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2560 ((uint32_t*)(src+i*stride))[1]= dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2561 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2562 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2563 ((uint32_t*)(src+i*stride))[0]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2564 ((uint32_t*)(src+i*stride))[1]= dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2565 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2566 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2567
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2568
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2569 static void pred8x8_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2570 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2571 int dc0, dc1, dc2, dc3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2572
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2573 dc0=dc1=dc2=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2574 for(i=0;i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2575 dc0+= src[-1+i*stride] + src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2576 dc1+= src[4+i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2577 dc2+= src[-1+(i+4)*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2578 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2579 dc3= 0x01010101*((dc1 + dc2 + 4)>>3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2580 dc0= 0x01010101*((dc0 + 4)>>3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2581 dc1= 0x01010101*((dc1 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2582 dc2= 0x01010101*((dc2 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2583
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2584 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2585 ((uint32_t*)(src+i*stride))[0]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2586 ((uint32_t*)(src+i*stride))[1]= dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2587 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2588 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2589 ((uint32_t*)(src+i*stride))[0]= dc2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2590 ((uint32_t*)(src+i*stride))[1]= dc3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2591 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2592 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2593
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2594 static void pred8x8_plane_c(uint8_t *src, int stride){
1184
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2595 int j, k;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2596 int a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2597 uint8_t *cm = cropTbl + MAX_NEG_CROP;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2598 const uint8_t * const src0 = src+3-stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2599 const uint8_t *src1 = src+4*stride-1;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2600 const uint8_t *src2 = src1-2*stride; // == src+2*stride-1;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2601 int H = src0[1] - src0[-1];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2602 int V = src1[0] - src2[ 0];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2603 for(k=2; k<=4; ++k) {
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2604 src1 += stride; src2 -= stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2605 H += k*(src0[k] - src0[-k]);
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2606 V += k*(src1[0] - src2[ 0]);
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2607 }
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2608 H = ( 17*H+16 ) >> 5;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2609 V = ( 17*V+16 ) >> 5;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2610
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2611 a = 16*(src1[0] + src2[8]+1) - 3*(V+H);
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2612 for(j=8; j>0; --j) {
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2613 int b = a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2614 a += V;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2615 src[0] = cm[ (b ) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2616 src[1] = cm[ (b+ H) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2617 src[2] = cm[ (b+2*H) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2618 src[3] = cm[ (b+3*H) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2619 src[4] = cm[ (b+4*H) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2620 src[5] = cm[ (b+5*H) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2621 src[6] = cm[ (b+6*H) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2622 src[7] = cm[ (b+7*H) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2623 src += stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
2624 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2625 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2626
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2627 #define SRC(x,y) src[(x)+(y)*stride]
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2628 #define PL(y) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2629 const int l##y = (SRC(-1,y-1) + 2*SRC(-1,y) + SRC(-1,y+1) + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2630 #define PREDICT_8x8_LOAD_LEFT \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2631 const int l0 = ((has_topleft ? SRC(-1,-1) : SRC(-1,0)) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2632 + 2*SRC(-1,0) + SRC(-1,1) + 2) >> 2; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2633 PL(1) PL(2) PL(3) PL(4) PL(5) PL(6) \
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
2634 const int l7 attribute_unused = (SRC(-1,6) + 3*SRC(-1,7) + 2) >> 2
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2635
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2636 #define PT(x) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2637 const int t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2638 #define PREDICT_8x8_LOAD_TOP \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2639 const int t0 = ((has_topleft ? SRC(-1,-1) : SRC(0,-1)) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2640 + 2*SRC(0,-1) + SRC(1,-1) + 2) >> 2; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2641 PT(1) PT(2) PT(3) PT(4) PT(5) PT(6) \
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
2642 const int t7 attribute_unused = ((has_topright ? SRC(8,-1) : SRC(7,-1)) \
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
2643 + 2*SRC(7,-1) + SRC(6,-1) + 2) >> 2
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2644
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2645 #define PTR(x) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2646 t##x = (SRC(x-1,-1) + 2*SRC(x,-1) + SRC(x+1,-1) + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2647 #define PREDICT_8x8_LOAD_TOPRIGHT \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2648 int t8, t9, t10, t11, t12, t13, t14, t15; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2649 if(has_topright) { \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2650 PTR(8) PTR(9) PTR(10) PTR(11) PTR(12) PTR(13) PTR(14) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2651 t15 = (SRC(14,-1) + 3*SRC(15,-1) + 2) >> 2; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2652 } else t8=t9=t10=t11=t12=t13=t14=t15= SRC(7,-1);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2653
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2654 #define PREDICT_8x8_LOAD_TOPLEFT \
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
2655 const int lt = (SRC(-1,0) + 2*SRC(-1,-1) + SRC(0,-1) + 2) >> 2
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2656
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2657 #define PREDICT_8x8_DC(v) \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2658 int y; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2659 for( y = 0; y < 8; y++ ) { \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2660 ((uint32_t*)src)[0] = \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2661 ((uint32_t*)src)[1] = v; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2662 src += stride; \
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2663 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2664
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2665 static void pred8x8l_128_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2666 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2667 PREDICT_8x8_DC(0x80808080);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2668 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2669 static void pred8x8l_left_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2670 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2671 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2672 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7+4) >> 3) * 0x01010101;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2673 PREDICT_8x8_DC(dc);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2674 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2675 static void pred8x8l_top_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2676 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2677 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2678 const uint32_t dc = ((t0+t1+t2+t3+t4+t5+t6+t7+4) >> 3) * 0x01010101;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2679 PREDICT_8x8_DC(dc);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2680 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2681 static void pred8x8l_dc_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2682 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2683 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2684 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2685 const uint32_t dc = ((l0+l1+l2+l3+l4+l5+l6+l7
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2686 +t0+t1+t2+t3+t4+t5+t6+t7+8) >> 4) * 0x01010101;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2687 PREDICT_8x8_DC(dc);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2688 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2689 static void pred8x8l_horizontal_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2690 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2691 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2692 #define ROW(y) ((uint32_t*)(src+y*stride))[0] =\
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2693 ((uint32_t*)(src+y*stride))[1] = 0x01010101 * l##y
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2694 ROW(0); ROW(1); ROW(2); ROW(3); ROW(4); ROW(5); ROW(6); ROW(7);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2695 #undef ROW
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2696 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2697 static void pred8x8l_vertical_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2698 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2699 int y;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2700 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2701 src[0] = t0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2702 src[1] = t1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2703 src[2] = t2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2704 src[3] = t3;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2705 src[4] = t4;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2706 src[5] = t5;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2707 src[6] = t6;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2708 src[7] = t7;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2709 for( y = 1; y < 8; y++ )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2710 *(uint64_t*)(src+y*stride) = *(uint64_t*)src;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2711 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2712 static void pred8x8l_down_left_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2713 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2714 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2715 PREDICT_8x8_LOAD_TOPRIGHT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2716 SRC(0,0)= (t0 + 2*t1 + t2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2717 SRC(0,1)=SRC(1,0)= (t1 + 2*t2 + t3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2718 SRC(0,2)=SRC(1,1)=SRC(2,0)= (t2 + 2*t3 + t4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2719 SRC(0,3)=SRC(1,2)=SRC(2,1)=SRC(3,0)= (t3 + 2*t4 + t5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2720 SRC(0,4)=SRC(1,3)=SRC(2,2)=SRC(3,1)=SRC(4,0)= (t4 + 2*t5 + t6 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2721 SRC(0,5)=SRC(1,4)=SRC(2,3)=SRC(3,2)=SRC(4,1)=SRC(5,0)= (t5 + 2*t6 + t7 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2722 SRC(0,6)=SRC(1,5)=SRC(2,4)=SRC(3,3)=SRC(4,2)=SRC(5,1)=SRC(6,0)= (t6 + 2*t7 + t8 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2723 SRC(0,7)=SRC(1,6)=SRC(2,5)=SRC(3,4)=SRC(4,3)=SRC(5,2)=SRC(6,1)=SRC(7,0)= (t7 + 2*t8 + t9 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2724 SRC(1,7)=SRC(2,6)=SRC(3,5)=SRC(4,4)=SRC(5,3)=SRC(6,2)=SRC(7,1)= (t8 + 2*t9 + t10 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2725 SRC(2,7)=SRC(3,6)=SRC(4,5)=SRC(5,4)=SRC(6,3)=SRC(7,2)= (t9 + 2*t10 + t11 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2726 SRC(3,7)=SRC(4,6)=SRC(5,5)=SRC(6,4)=SRC(7,3)= (t10 + 2*t11 + t12 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2727 SRC(4,7)=SRC(5,6)=SRC(6,5)=SRC(7,4)= (t11 + 2*t12 + t13 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2728 SRC(5,7)=SRC(6,6)=SRC(7,5)= (t12 + 2*t13 + t14 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2729 SRC(6,7)=SRC(7,6)= (t13 + 2*t14 + t15 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2730 SRC(7,7)= (t14 + 3*t15 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2731 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2732 static void pred8x8l_down_right_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2733 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2734 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2735 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2736 PREDICT_8x8_LOAD_TOPLEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2737 SRC(0,7)= (l7 + 2*l6 + l5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2738 SRC(0,6)=SRC(1,7)= (l6 + 2*l5 + l4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2739 SRC(0,5)=SRC(1,6)=SRC(2,7)= (l5 + 2*l4 + l3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2740 SRC(0,4)=SRC(1,5)=SRC(2,6)=SRC(3,7)= (l4 + 2*l3 + l2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2741 SRC(0,3)=SRC(1,4)=SRC(2,5)=SRC(3,6)=SRC(4,7)= (l3 + 2*l2 + l1 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2742 SRC(0,2)=SRC(1,3)=SRC(2,4)=SRC(3,5)=SRC(4,6)=SRC(5,7)= (l2 + 2*l1 + l0 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2743 SRC(0,1)=SRC(1,2)=SRC(2,3)=SRC(3,4)=SRC(4,5)=SRC(5,6)=SRC(6,7)= (l1 + 2*l0 + lt + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2744 SRC(0,0)=SRC(1,1)=SRC(2,2)=SRC(3,3)=SRC(4,4)=SRC(5,5)=SRC(6,6)=SRC(7,7)= (l0 + 2*lt + t0 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2745 SRC(1,0)=SRC(2,1)=SRC(3,2)=SRC(4,3)=SRC(5,4)=SRC(6,5)=SRC(7,6)= (lt + 2*t0 + t1 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2746 SRC(2,0)=SRC(3,1)=SRC(4,2)=SRC(5,3)=SRC(6,4)=SRC(7,5)= (t0 + 2*t1 + t2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2747 SRC(3,0)=SRC(4,1)=SRC(5,2)=SRC(6,3)=SRC(7,4)= (t1 + 2*t2 + t3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2748 SRC(4,0)=SRC(5,1)=SRC(6,2)=SRC(7,3)= (t2 + 2*t3 + t4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2749 SRC(5,0)=SRC(6,1)=SRC(7,2)= (t3 + 2*t4 + t5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2750 SRC(6,0)=SRC(7,1)= (t4 + 2*t5 + t6 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2751 SRC(7,0)= (t5 + 2*t6 + t7 + 2) >> 2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2752
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2753 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2754 static void pred8x8l_vertical_right_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2755 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2756 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2757 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2758 PREDICT_8x8_LOAD_TOPLEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2759 SRC(0,6)= (l5 + 2*l4 + l3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2760 SRC(0,7)= (l6 + 2*l5 + l4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2761 SRC(0,4)=SRC(1,6)= (l3 + 2*l2 + l1 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2762 SRC(0,5)=SRC(1,7)= (l4 + 2*l3 + l2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2763 SRC(0,2)=SRC(1,4)=SRC(2,6)= (l1 + 2*l0 + lt + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2764 SRC(0,3)=SRC(1,5)=SRC(2,7)= (l2 + 2*l1 + l0 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2765 SRC(0,1)=SRC(1,3)=SRC(2,5)=SRC(3,7)= (l0 + 2*lt + t0 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2766 SRC(0,0)=SRC(1,2)=SRC(2,4)=SRC(3,6)= (lt + t0 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2767 SRC(1,1)=SRC(2,3)=SRC(3,5)=SRC(4,7)= (lt + 2*t0 + t1 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2768 SRC(1,0)=SRC(2,2)=SRC(3,4)=SRC(4,6)= (t0 + t1 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2769 SRC(2,1)=SRC(3,3)=SRC(4,5)=SRC(5,7)= (t0 + 2*t1 + t2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2770 SRC(2,0)=SRC(3,2)=SRC(4,4)=SRC(5,6)= (t1 + t2 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2771 SRC(3,1)=SRC(4,3)=SRC(5,5)=SRC(6,7)= (t1 + 2*t2 + t3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2772 SRC(3,0)=SRC(4,2)=SRC(5,4)=SRC(6,6)= (t2 + t3 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2773 SRC(4,1)=SRC(5,3)=SRC(6,5)=SRC(7,7)= (t2 + 2*t3 + t4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2774 SRC(4,0)=SRC(5,2)=SRC(6,4)=SRC(7,6)= (t3 + t4 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2775 SRC(5,1)=SRC(6,3)=SRC(7,5)= (t3 + 2*t4 + t5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2776 SRC(5,0)=SRC(6,2)=SRC(7,4)= (t4 + t5 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2777 SRC(6,1)=SRC(7,3)= (t4 + 2*t5 + t6 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2778 SRC(6,0)=SRC(7,2)= (t5 + t6 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2779 SRC(7,1)= (t5 + 2*t6 + t7 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2780 SRC(7,0)= (t6 + t7 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2781 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2782 static void pred8x8l_horizontal_down_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2783 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2784 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2785 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2786 PREDICT_8x8_LOAD_TOPLEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2787 SRC(0,7)= (l6 + l7 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2788 SRC(1,7)= (l5 + 2*l6 + l7 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2789 SRC(0,6)=SRC(2,7)= (l5 + l6 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2790 SRC(1,6)=SRC(3,7)= (l4 + 2*l5 + l6 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2791 SRC(0,5)=SRC(2,6)=SRC(4,7)= (l4 + l5 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2792 SRC(1,5)=SRC(3,6)=SRC(5,7)= (l3 + 2*l4 + l5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2793 SRC(0,4)=SRC(2,5)=SRC(4,6)=SRC(6,7)= (l3 + l4 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2794 SRC(1,4)=SRC(3,5)=SRC(5,6)=SRC(7,7)= (l2 + 2*l3 + l4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2795 SRC(0,3)=SRC(2,4)=SRC(4,5)=SRC(6,6)= (l2 + l3 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2796 SRC(1,3)=SRC(3,4)=SRC(5,5)=SRC(7,6)= (l1 + 2*l2 + l3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2797 SRC(0,2)=SRC(2,3)=SRC(4,4)=SRC(6,5)= (l1 + l2 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2798 SRC(1,2)=SRC(3,3)=SRC(5,4)=SRC(7,5)= (l0 + 2*l1 + l2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2799 SRC(0,1)=SRC(2,2)=SRC(4,3)=SRC(6,4)= (l0 + l1 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2800 SRC(1,1)=SRC(3,2)=SRC(5,3)=SRC(7,4)= (lt + 2*l0 + l1 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2801 SRC(0,0)=SRC(2,1)=SRC(4,2)=SRC(6,3)= (lt + l0 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2802 SRC(1,0)=SRC(3,1)=SRC(5,2)=SRC(7,3)= (l0 + 2*lt + t0 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2803 SRC(2,0)=SRC(4,1)=SRC(6,2)= (t1 + 2*t0 + lt + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2804 SRC(3,0)=SRC(5,1)=SRC(7,2)= (t2 + 2*t1 + t0 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2805 SRC(4,0)=SRC(6,1)= (t3 + 2*t2 + t1 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2806 SRC(5,0)=SRC(7,1)= (t4 + 2*t3 + t2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2807 SRC(6,0)= (t5 + 2*t4 + t3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2808 SRC(7,0)= (t6 + 2*t5 + t4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2809 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2810 static void pred8x8l_vertical_left_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2811 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2812 PREDICT_8x8_LOAD_TOP;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2813 PREDICT_8x8_LOAD_TOPRIGHT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2814 SRC(0,0)= (t0 + t1 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2815 SRC(0,1)= (t0 + 2*t1 + t2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2816 SRC(0,2)=SRC(1,0)= (t1 + t2 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2817 SRC(0,3)=SRC(1,1)= (t1 + 2*t2 + t3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2818 SRC(0,4)=SRC(1,2)=SRC(2,0)= (t2 + t3 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2819 SRC(0,5)=SRC(1,3)=SRC(2,1)= (t2 + 2*t3 + t4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2820 SRC(0,6)=SRC(1,4)=SRC(2,2)=SRC(3,0)= (t3 + t4 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2821 SRC(0,7)=SRC(1,5)=SRC(2,3)=SRC(3,1)= (t3 + 2*t4 + t5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2822 SRC(1,6)=SRC(2,4)=SRC(3,2)=SRC(4,0)= (t4 + t5 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2823 SRC(1,7)=SRC(2,5)=SRC(3,3)=SRC(4,1)= (t4 + 2*t5 + t6 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2824 SRC(2,6)=SRC(3,4)=SRC(4,2)=SRC(5,0)= (t5 + t6 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2825 SRC(2,7)=SRC(3,5)=SRC(4,3)=SRC(5,1)= (t5 + 2*t6 + t7 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2826 SRC(3,6)=SRC(4,4)=SRC(5,2)=SRC(6,0)= (t6 + t7 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2827 SRC(3,7)=SRC(4,5)=SRC(5,3)=SRC(6,1)= (t6 + 2*t7 + t8 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2828 SRC(4,6)=SRC(5,4)=SRC(6,2)=SRC(7,0)= (t7 + t8 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2829 SRC(4,7)=SRC(5,5)=SRC(6,3)=SRC(7,1)= (t7 + 2*t8 + t9 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2830 SRC(5,6)=SRC(6,4)=SRC(7,2)= (t8 + t9 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2831 SRC(5,7)=SRC(6,5)=SRC(7,3)= (t8 + 2*t9 + t10 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2832 SRC(6,6)=SRC(7,4)= (t9 + t10 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2833 SRC(6,7)=SRC(7,5)= (t9 + 2*t10 + t11 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2834 SRC(7,6)= (t10 + t11 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2835 SRC(7,7)= (t10 + 2*t11 + t12 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2836 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2837 static void pred8x8l_horizontal_up_c(uint8_t *src, int has_topleft, int has_topright, int stride)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2838 {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2839 PREDICT_8x8_LOAD_LEFT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2840 SRC(0,0)= (l0 + l1 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2841 SRC(1,0)= (l0 + 2*l1 + l2 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2842 SRC(0,1)=SRC(2,0)= (l1 + l2 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2843 SRC(1,1)=SRC(3,0)= (l1 + 2*l2 + l3 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2844 SRC(0,2)=SRC(2,1)=SRC(4,0)= (l2 + l3 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2845 SRC(1,2)=SRC(3,1)=SRC(5,0)= (l2 + 2*l3 + l4 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2846 SRC(0,3)=SRC(2,2)=SRC(4,1)=SRC(6,0)= (l3 + l4 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2847 SRC(1,3)=SRC(3,2)=SRC(5,1)=SRC(7,0)= (l3 + 2*l4 + l5 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2848 SRC(0,4)=SRC(2,3)=SRC(4,2)=SRC(6,1)= (l4 + l5 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2849 SRC(1,4)=SRC(3,3)=SRC(5,2)=SRC(7,1)= (l4 + 2*l5 + l6 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2850 SRC(0,5)=SRC(2,4)=SRC(4,3)=SRC(6,2)= (l5 + l6 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2851 SRC(1,5)=SRC(3,4)=SRC(5,3)=SRC(7,2)= (l5 + 2*l6 + l7 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2852 SRC(0,6)=SRC(2,5)=SRC(4,4)=SRC(6,3)= (l6 + l7 + 1) >> 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2853 SRC(1,6)=SRC(3,5)=SRC(5,4)=SRC(7,3)= (l6 + 3*l7 + 2) >> 2;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2854 SRC(0,7)=SRC(1,7)=SRC(2,6)=SRC(2,7)=SRC(3,6)=
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2855 SRC(3,7)=SRC(4,5)=SRC(4,6)=SRC(4,7)=SRC(5,5)=
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2856 SRC(5,6)=SRC(5,7)=SRC(6,4)=SRC(6,5)=SRC(6,6)=
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2857 SRC(6,7)=SRC(7,4)=SRC(7,5)=SRC(7,6)=SRC(7,7)= l7;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2858 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2859 #undef PREDICT_8x8_LOAD_LEFT
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2860 #undef PREDICT_8x8_LOAD_TOP
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2861 #undef PREDICT_8x8_LOAD_TOPLEFT
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2862 #undef PREDICT_8x8_LOAD_TOPRIGHT
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2863 #undef PREDICT_8x8_DC
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2864 #undef PTR
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2865 #undef PT
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2866 #undef PL
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2867 #undef SRC
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
2868
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2869 static inline void mc_dir_part(H264Context *h, Picture *pic, int n, int square, int chroma_height, int delta, int list,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2870 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2871 int src_x_offset, int src_y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2872 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2873 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2874 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2875 int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2876 const int luma_xy= (mx&3) + ((my&3)<<2);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2877 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*h->mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2878 uint8_t * src_cb, * src_cr;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2879 int extra_width= h->emu_edge_width;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2880 int extra_height= h->emu_edge_height;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2881 int emu=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2882 const int full_mx= mx>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2883 const int full_my= my>>2;
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
2884 const int pic_width = 16*s->mb_width;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2885 const int pic_height = 16*s->mb_height >> MB_MBAFF;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2886
3125
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
2887 if(!pic->data[0])
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
2888 return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2889
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2890 if(mx&7) extra_width -= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2891 if(my&7) extra_height -= 3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2892
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2893 if( full_mx < 0-extra_width
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2894 || full_my < 0-extra_height
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2895 || full_mx + 16/*FIXME*/ > pic_width + extra_width
2861
3b920e274b26 fix emulated edge motion compensation when resolution%16!=0
lorenm
parents: 2846
diff changeset
2896 || full_my + 16/*FIXME*/ > pic_height + extra_height){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2897 ff_emulated_edge_mc(s->edge_emu_buffer, src_y - 2 - 2*h->mb_linesize, h->mb_linesize, 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, pic_width, pic_height);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2898 src_y= s->edge_emu_buffer + 2 + 2*h->mb_linesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2899 emu=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2900 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2901
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2902 qpix_op[luma_xy](dest_y, src_y, h->mb_linesize); //FIXME try variable height perhaps?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2903 if(!square){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2904 qpix_op[luma_xy](dest_y + delta, src_y + delta, h->mb_linesize);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2905 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2906
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2907 if(s->flags&CODEC_FLAG_GRAY) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2908
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2909 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2910 // chroma offset when predicting from a field of opposite parity
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2911 my += 2 * ((s->mb_y & 1) - (h->ref_cache[list][scan8[n]] & 1));
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2912 emu |= (my>>3) < 0 || (my>>3) + 8 >= (pic_height>>1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2913 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2914 src_cb= pic->data[1] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2915 src_cr= pic->data[2] + (mx>>3) + (my>>3)*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2916
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2917 if(emu){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2918 ff_emulated_edge_mc(s->edge_emu_buffer, src_cb, h->mb_uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2919 src_cb= s->edge_emu_buffer;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2920 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2921 chroma_op(dest_cb, src_cb, h->mb_uvlinesize, chroma_height, mx&7, my&7);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2922
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2923 if(emu){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2924 ff_emulated_edge_mc(s->edge_emu_buffer, src_cr, h->mb_uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2925 src_cr= s->edge_emu_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2926 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2927 chroma_op(dest_cr, src_cr, h->mb_uvlinesize, chroma_height, mx&7, my&7);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2928 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2929
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2930 static inline void mc_part_std(H264Context *h, int n, int square, int chroma_height, int delta,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2931 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2932 int x_offset, int y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2933 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2934 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2935 int list0, int list1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2936 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2937 qpel_mc_func *qpix_op= qpix_put;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2938 h264_chroma_mc_func chroma_op= chroma_put;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2939
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2940 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2941 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2942 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2943 x_offset += 8*s->mb_x;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2944 y_offset += 8*(s->mb_y >> MB_MBAFF);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2945
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2946 if(list0){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2947 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2948 mc_dir_part(h, ref, n, square, chroma_height, delta, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2949 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2950 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2951
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2952 qpix_op= qpix_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2953 chroma_op= chroma_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2954 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2955
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2956 if(list1){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2957 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2958 mc_dir_part(h, ref, n, square, chroma_height, delta, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2959 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2960 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2961 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2962 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2963
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2964 static inline void mc_part_weighted(H264Context *h, int n, int square, int chroma_height, int delta,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2965 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2966 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2967 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2968 h264_weight_func luma_weight_op, h264_weight_func chroma_weight_op,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2969 h264_biweight_func luma_weight_avg, h264_biweight_func chroma_weight_avg,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2970 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2971 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2972
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2973 dest_y += 2*x_offset + 2*y_offset*h-> mb_linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2974 dest_cb += x_offset + y_offset*h->mb_uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2975 dest_cr += x_offset + y_offset*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2976 x_offset += 8*s->mb_x;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2977 y_offset += 8*(s->mb_y >> MB_MBAFF);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
2978
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2979 if(list0 && list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2980 /* don't optimize for luma-only case, since B-frames usually
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2981 * use implicit weights => chroma too. */
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2982 uint8_t *tmp_cb = s->obmc_scratchpad;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2983 uint8_t *tmp_cr = s->obmc_scratchpad + 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2984 uint8_t *tmp_y = s->obmc_scratchpad + 8*h->mb_uvlinesize;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2985 int refn0 = h->ref_cache[0][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2986 int refn1 = h->ref_cache[1][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2987
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2988 mc_dir_part(h, &h->ref_list[0][refn0], n, square, chroma_height, delta, 0,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2989 dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2990 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2991 mc_dir_part(h, &h->ref_list[1][refn1], n, square, chroma_height, delta, 1,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2992 tmp_y, tmp_cb, tmp_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2993 x_offset, y_offset, qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2994
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2995 if(h->use_weight == 2){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2996 int weight0 = h->implicit_weight[refn0][refn1];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
2997 int weight1 = 64 - weight0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2998 luma_weight_avg( dest_y, tmp_y, h-> mb_linesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
2999 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, 5, weight0, weight1, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3000 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, 5, weight0, weight1, 0);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3001 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3002 luma_weight_avg(dest_y, tmp_y, h->mb_linesize, h->luma_log2_weight_denom,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3003 h->luma_weight[0][refn0], h->luma_weight[1][refn1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
3004 h->luma_offset[0][refn0] + h->luma_offset[1][refn1]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3005 chroma_weight_avg(dest_cb, tmp_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3006 h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
3007 h->chroma_offset[0][refn0][0] + h->chroma_offset[1][refn1][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3008 chroma_weight_avg(dest_cr, tmp_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3009 h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1],
3029
7a92269a3ccd tweak h264_biweight
lorenm
parents: 3028
diff changeset
3010 h->chroma_offset[0][refn0][1] + h->chroma_offset[1][refn1][1]);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3011 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3012 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3013 int list = list1 ? 1 : 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3014 int refn = h->ref_cache[list][ scan8[n] ];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3015 Picture *ref= &h->ref_list[list][refn];
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3016 mc_dir_part(h, ref, n, square, chroma_height, delta, list,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3017 dest_y, dest_cb, dest_cr, x_offset, y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3018 qpix_put, chroma_put);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3019
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3020 luma_weight_op(dest_y, h->mb_linesize, h->luma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3021 h->luma_weight[list][refn], h->luma_offset[list][refn]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3022 if(h->use_weight_chroma){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3023 chroma_weight_op(dest_cb, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3024 h->chroma_weight[list][refn][0], h->chroma_offset[list][refn][0]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3025 chroma_weight_op(dest_cr, h->mb_uvlinesize, h->chroma_log2_weight_denom,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3026 h->chroma_weight[list][refn][1], h->chroma_offset[list][refn][1]);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3027 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3028 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3029 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3030
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3031 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3032 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3033 int x_offset, int y_offset,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3034 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3035 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3036 h264_weight_func *weight_op, h264_biweight_func *weight_avg,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3037 int list0, int list1){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3038 if((h->use_weight==2 && list0 && list1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3039 && (h->implicit_weight[ h->ref_cache[0][scan8[n]] ][ h->ref_cache[1][scan8[n]] ] != 32))
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3040 || h->use_weight==1)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3041 mc_part_weighted(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3042 x_offset, y_offset, qpix_put, chroma_put,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3043 weight_op[0], weight_op[3], weight_avg[0], weight_avg[3], list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3044 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3045 mc_part_std(h, n, square, chroma_height, delta, dest_y, dest_cb, dest_cr,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3046 x_offset, y_offset, qpix_put, chroma_put, qpix_avg, chroma_avg, list0, list1);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3047 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3048
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3049 static inline void prefetch_motion(H264Context *h, int list){
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3050 /* fetch pixels for estimated mv 4 macroblocks ahead
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3051 * optimized for 64byte cache lines */
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3052 MpegEncContext * const s = &h->s;
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3053 const int refn = h->ref_cache[list][scan8[0]];
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3054 if(refn >= 0){
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3055 const int mx= (h->mv_cache[list][scan8[0]][0]>>2) + 16*s->mb_x + 8;
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3056 const int my= (h->mv_cache[list][scan8[0]][1]>>2) + 16*s->mb_y;
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3057 uint8_t **src= h->ref_list[list][refn].data;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3058 int off= mx + (my + (s->mb_x&3)*4)*h->mb_linesize + 64;
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3059 s->dsp.prefetch(src[0]+off, s->linesize, 4);
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3060 off= (mx>>1) + ((my>>1) + (s->mb_x&7))*s->uvlinesize + 64;
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3061 s->dsp.prefetch(src[1]+off, src[2]-src[1], 2);
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3062 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3063 }
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3064
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3065 static void hl_motion(H264Context *h, uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3066 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put),
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3067 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg),
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3068 h264_weight_func *weight_op, h264_biweight_func *weight_avg){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3069 MpegEncContext * const s = &h->s;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
3070 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3071 const int mb_type= s->current_picture.mb_type[mb_xy];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3072
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3073 assert(IS_INTER(mb_type));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3074
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3075 prefetch_motion(h, 0);
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3076
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3077 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3078 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3079 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3080 &weight_op[0], &weight_avg[0],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3081 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3082 }else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3083 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3084 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3085 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3086 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3087 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3088 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3089 &weight_op[1], &weight_avg[1],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3090 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3091 }else if(IS_8X16(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3092 mc_part(h, 0, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 0, 0,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3093 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3094 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3095 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3096 mc_part(h, 4, 0, 8, 8*h->mb_linesize, dest_y, dest_cb, dest_cr, 4, 0,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3097 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3098 &weight_op[2], &weight_avg[2],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3099 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3100 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3101 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3102
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3103 assert(IS_8X8(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3104
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3105 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3106 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3107 const int n= 4*i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3108 int x_offset= (i&1)<<2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3109 int y_offset= (i&2)<<1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3110
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3111 if(IS_SUB_8X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3112 mc_part(h, n, 1, 4, 0, dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3113 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3114 &weight_op[3], &weight_avg[3],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3115 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3116 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3117 mc_part(h, n , 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3118 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3119 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3120 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3121 mc_part(h, n+2, 0, 2, 4, dest_y, dest_cb, dest_cr, x_offset, y_offset+2,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3122 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3123 &weight_op[4], &weight_avg[4],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3124 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3125 }else if(IS_SUB_4X8(sub_mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3126 mc_part(h, n , 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3127 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3128 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3129 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3130 mc_part(h, n+1, 0, 4, 4*h->mb_linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3131 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3132 &weight_op[5], &weight_avg[5],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3133 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3134 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3135 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3136 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3137 for(j=0; j<4; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3138 int sub_x_offset= x_offset + 2*(j&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3139 int sub_y_offset= y_offset + (j&2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3140 mc_part(h, n+j, 1, 2, 0, dest_y, dest_cb, dest_cr, sub_x_offset, sub_y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3141 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3142 &weight_op[6], &weight_avg[6],
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3143 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3144 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3145 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3146 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3147 }
3215
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3148
06f98047ff26 prefetch pixels for future motion compensation. 2-5% faster h264.
lorenm
parents: 3212
diff changeset
3149 prefetch_motion(h, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3150 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3151
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3152 static void decode_init_vlc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3153 static int done = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3154
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3155 if (!done) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3156 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3157 done = 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3158
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3159 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3160 &chroma_dc_coeff_token_len [0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
3161 &chroma_dc_coeff_token_bits[0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3162
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3163 for(i=0; i<4; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3164 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3165 &coeff_token_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
3166 &coeff_token_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3167 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3169 for(i=0; i<3; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3170 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3171 &chroma_dc_total_zeros_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
3172 &chroma_dc_total_zeros_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3173 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3174 for(i=0; i<15; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3175 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3176 &total_zeros_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
3177 &total_zeros_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3178 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3179
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3180 for(i=0; i<6; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3181 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3182 &run_len [i][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
3183 &run_bits[i][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3184 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3185 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3186 &run_len [6][0], 1, 1,
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2365
diff changeset
3187 &run_bits[6][0], 1, 1, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3188 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3189 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3190
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3191 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3192 * Sets the intra prediction function pointers.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3193 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3194 static void init_pred_ptrs(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3195 // MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3196
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3197 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3198 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3199 h->pred4x4[DC_PRED ]= pred4x4_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3200 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3201 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3202 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3203 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3204 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3205 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3206 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3207 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3208 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3209
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3210 h->pred8x8l[VERT_PRED ]= pred8x8l_vertical_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3211 h->pred8x8l[HOR_PRED ]= pred8x8l_horizontal_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3212 h->pred8x8l[DC_PRED ]= pred8x8l_dc_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3213 h->pred8x8l[DIAG_DOWN_LEFT_PRED ]= pred8x8l_down_left_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3214 h->pred8x8l[DIAG_DOWN_RIGHT_PRED]= pred8x8l_down_right_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3215 h->pred8x8l[VERT_RIGHT_PRED ]= pred8x8l_vertical_right_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3216 h->pred8x8l[HOR_DOWN_PRED ]= pred8x8l_horizontal_down_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3217 h->pred8x8l[VERT_LEFT_PRED ]= pred8x8l_vertical_left_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3218 h->pred8x8l[HOR_UP_PRED ]= pred8x8l_horizontal_up_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3219 h->pred8x8l[LEFT_DC_PRED ]= pred8x8l_left_dc_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3220 h->pred8x8l[TOP_DC_PRED ]= pred8x8l_top_dc_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3221 h->pred8x8l[DC_128_PRED ]= pred8x8l_128_dc_c;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3222
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3223 h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3224 h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3225 h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3226 h->pred8x8[PLANE_PRED8x8 ]= pred8x8_plane_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3227 h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3228 h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3229 h->pred8x8[DC_128_PRED8x8 ]= pred8x8_128_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3230
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3231 h->pred16x16[DC_PRED8x8 ]= pred16x16_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3232 h->pred16x16[VERT_PRED8x8 ]= pred16x16_vertical_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3233 h->pred16x16[HOR_PRED8x8 ]= pred16x16_horizontal_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3234 h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3235 h->pred16x16[LEFT_DC_PRED8x8]= pred16x16_left_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3236 h->pred16x16[TOP_DC_PRED8x8 ]= pred16x16_top_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3237 h->pred16x16[DC_128_PRED8x8 ]= pred16x16_128_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3238 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3239
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3240 static void free_tables(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3241 av_freep(&h->intra4x4_pred_mode);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3242 av_freep(&h->chroma_pred_mode_table);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3243 av_freep(&h->cbp_table);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
3244 av_freep(&h->mvd_table[0]);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
3245 av_freep(&h->mvd_table[1]);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3246 av_freep(&h->direct_table);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3247 av_freep(&h->non_zero_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3248 av_freep(&h->slice_table_base);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3249 av_freep(&h->top_borders[1]);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3250 av_freep(&h->top_borders[0]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3251 h->slice_table= NULL;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3252
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3253 av_freep(&h->mb2b_xy);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3254 av_freep(&h->mb2b8_xy);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3255
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3256 av_freep(&h->s.obmc_scratchpad);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3257 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3258
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3259 static void init_dequant8_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3260 int i,q,x;
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
3261 const int transpose = (h->s.dsp.h264_idct8_add != ff_h264_idct8_add_c); //FIXME ugly
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3262 h->dequant8_coeff[0] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3263 h->dequant8_coeff[1] = h->dequant8_buffer[1];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3264
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3265 for(i=0; i<2; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3266 if(i && !memcmp(h->pps.scaling_matrix8[0], h->pps.scaling_matrix8[1], 64*sizeof(uint8_t))){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3267 h->dequant8_coeff[1] = h->dequant8_buffer[0];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3268 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3269 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3270
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3271 for(q=0; q<52; q++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3272 int shift = div6[q];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3273 int idx = rem6[q];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3274 for(x=0; x<64; x++)
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
3275 h->dequant8_coeff[i][q][transpose ? (x>>3)|((x&7)<<3) : x] =
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
3276 ((uint32_t)dequant8_coeff_init[idx][ dequant8_coeff_init_scan[((x>>1)&12) | (x&3)] ] *
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
3277 h->pps.scaling_matrix8[i][x]) << shift;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3278 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3279 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3280 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3281
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3282 static void init_dequant4_coeff_table(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3283 int i,j,q,x;
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
3284 const int transpose = (h->s.dsp.h264_idct_add != ff_h264_idct_add_c); //FIXME ugly
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3285 for(i=0; i<6; i++ ){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3286 h->dequant4_coeff[i] = h->dequant4_buffer[i];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3287 for(j=0; j<i; j++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3288 if(!memcmp(h->pps.scaling_matrix4[j], h->pps.scaling_matrix4[i], 16*sizeof(uint8_t))){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3289 h->dequant4_coeff[i] = h->dequant4_buffer[j];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3290 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3291 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3292 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3293 if(j<i)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3294 continue;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3295
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3296 for(q=0; q<52; q++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3297 int shift = div6[q] + 2;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3298 int idx = rem6[q];
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3299 for(x=0; x<16; x++)
3005
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
3300 h->dequant4_coeff[i][q][transpose ? (x>>2)|((x<<2)&0xF) : x] =
6f6f307cffac fix asymmetric CQMs with pre-transposed DCT.
lorenm
parents: 3004
diff changeset
3301 ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] *
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3302 h->pps.scaling_matrix4[i][x]) << shift;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3303 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3304 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3305 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3306
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3307 static void init_dequant_tables(H264Context *h){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3308 int i,x;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3309 init_dequant4_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3310 if(h->pps.transform_8x8_mode)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3311 init_dequant8_coeff_table(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3312 if(h->sps.transform_bypass){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3313 for(i=0; i<6; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3314 for(x=0; x<16; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3315 h->dequant4_coeff[i][0][x] = 1<<6;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3316 if(h->pps.transform_8x8_mode)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3317 for(i=0; i<2; i++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3318 for(x=0; x<64; x++)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3319 h->dequant8_coeff[i][0][x] = 1<<6;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3320 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3321 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3322
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3323
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3324 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3325 * allocates tables.
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3326 * needs width/height
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3327 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3328 static int alloc_tables(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3329 MpegEncContext * const s = &h->s;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
3330 const int big_mb_num= s->mb_stride * (s->mb_height+1);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3331 int x,y;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3332
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3333 CHECKED_ALLOCZ(h->intra4x4_pred_mode, big_mb_num * 8 * sizeof(uint8_t))
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3334
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3335 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t))
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3336 CHECKED_ALLOCZ(h->slice_table_base , (big_mb_num+s->mb_stride) * sizeof(uint8_t))
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3337 CHECKED_ALLOCZ(h->top_borders[0] , s->mb_width * (16+8+8) * sizeof(uint8_t))
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3338 CHECKED_ALLOCZ(h->top_borders[1] , s->mb_width * (16+8+8) * sizeof(uint8_t))
2336
9cd834fc7325 segfault fix
michael
parents: 2317
diff changeset
3339 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3340
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3341 if( h->pps.cabac ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3342 CHECKED_ALLOCZ(h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t))
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
3343 CHECKED_ALLOCZ(h->mvd_table[0], 32*big_mb_num * sizeof(uint16_t));
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
3344 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_t));
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
3345 CHECKED_ALLOCZ(h->direct_table, 32*big_mb_num * sizeof(uint8_t));
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3346 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3347
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3348 memset(h->slice_table_base, -1, (big_mb_num+s->mb_stride) * sizeof(uint8_t));
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3349 h->slice_table= h->slice_table_base + s->mb_stride*2 + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3350
2641
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
3351 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint32_t));
c337f851d0f9 fix storage of motion vectors for frames with more than 4096 macroblocks.
lorenm
parents: 2640
diff changeset
3352 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint32_t));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3353 for(y=0; y<s->mb_height; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3354 for(x=0; x<s->mb_width; x++){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
3355 const int mb_xy= x + y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3356 const int b_xy = 4*x + 4*y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3357 const int b8_xy= 2*x + 2*y*h->b8_stride;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3358
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3359 h->mb2b_xy [mb_xy]= b_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3360 h->mb2b8_xy[mb_xy]= b8_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3361 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3362 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
3363
2417
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
3364 s->obmc_scratchpad = NULL;
991f39305057 10l (obmc_scratchpad not always initialize)
lorenm
parents: 2416
diff changeset
3365
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
3366 if(!h->dequant4_coeff[0])
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
3367 init_dequant_tables(h);
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
3368
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3369 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3370 fail:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3371 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3372 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3373 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3374
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3375 static void common_init(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3376 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3377
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3378 s->width = s->avctx->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3379 s->height = s->avctx->height;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3380 s->codec_id= s->avctx->codec->id;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3381
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3382 init_pred_ptrs(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3383
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3384 h->dequant_coeff_pps= -1;
1698
420cac032278 svq3 fix
michael
parents: 1636
diff changeset
3385 s->unrestricted_mv=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3386 s->decode=1; //FIXME
2920
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
3387
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
3388 memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t));
1443b4d3f4ab 10l: cqm weren't initialized in svq3.
lorenm
parents: 2919
diff changeset
3389 memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t));
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3390 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3391
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3392 static int decode_init(AVCodecContext *avctx){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3393 H264Context *h= avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3394 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3395
1892
5ac49e7a1b8f init cleanup
michael
parents: 1786
diff changeset
3396 MPV_decode_defaults(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3397
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3398 s->avctx = avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3399 common_init(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3400
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3401 s->out_format = FMT_H264;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3402 s->workaround_bugs= avctx->workaround_bugs;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3403
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3404 // set defaults
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3405 // s->decode_mb= ff_h263_decode_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3406 s->low_delay= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3407 avctx->pix_fmt= PIX_FMT_YUV420P;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3408
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3409 decode_init_vlc(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3410
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
3411 if(avctx->extradata_size > 0 && avctx->extradata &&
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
3412 *(char *)avctx->extradata == 1){
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
3413 h->is_avc = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
3414 h->got_avcC = 0;
2547
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
3415 } else {
c5781912ad8a improved detection of "AVC1" style H.264 patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2538
diff changeset
3416 h->is_avc = 0;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
3417 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
3418
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3419 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3420 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3421
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
3422 static int frame_start(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3423 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3424 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3425
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
3426 if(MPV_frame_start(s, s->avctx) < 0)
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
3427 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3428 ff_er_frame_start(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3429
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3430 assert(s->linesize && s->uvlinesize);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3431
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3432 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3433 h->block_offset[i]= 4*((scan8[i] - scan8[0])&7) + 4*s->linesize*((scan8[i] - scan8[0])>>3);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3434 h->block_offset[24+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->linesize*((scan8[i] - scan8[0])>>3);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3435 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3436 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3437 h->block_offset[16+i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3438 h->block_offset[20+i]= 4*((scan8[i] - scan8[0])&7) + 4*s->uvlinesize*((scan8[i] - scan8[0])>>3);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3439 h->block_offset[24+16+i]=
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3440 h->block_offset[24+20+i]= 4*((scan8[i] - scan8[0])&7) + 8*s->uvlinesize*((scan8[i] - scan8[0])>>3);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3441 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3442
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
3443 /* can't be in alloc_tables because linesize isn't known there.
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
3444 * FIXME: redo bipred weight to not require extra buffer? */
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
3445 if(!s->obmc_scratchpad)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3446 s->obmc_scratchpad = av_malloc(16*2*s->linesize + 8*2*s->uvlinesize);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3447
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3448 /* some macroblocks will be accessed before they're available */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3449 if(FRAME_MBAFF)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3450 memset(h->slice_table, -1, (s->mb_height*s->mb_stride-1) * sizeof(uint8_t));
2416
06b7d678b582 10l: scratchpad could be allocated before its size was known.
lorenm
parents: 2415
diff changeset
3451
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3452 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1;
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
3453 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3454 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3455
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3456 static inline void backup_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize){
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3457 MpegEncContext * const s = &h->s;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3458 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3459
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3460 src_y -= linesize;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3461 src_cb -= uvlinesize;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3462 src_cr -= uvlinesize;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3463
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3464 // There are two lines saved, the line above the the top macroblock of a pair,
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3465 // and the line above the bottom macroblock
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3466 h->left_border[0]= h->top_borders[0][s->mb_x][15];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3467 for(i=1; i<17; i++){
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3468 h->left_border[i]= src_y[15+i* linesize];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3469 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3470
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3471 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 16*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3472 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3473
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3474 if(!(s->flags&CODEC_FLAG_GRAY)){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3475 h->left_border[17 ]= h->top_borders[0][s->mb_x][16+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3476 h->left_border[17+9]= h->top_borders[0][s->mb_x][24+7];
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3477 for(i=1; i<9; i++){
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3478 h->left_border[i+17 ]= src_cb[7+i*uvlinesize];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3479 h->left_border[i+17+9]= src_cr[7+i*uvlinesize];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3480 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3481 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+8*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3482 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+8*uvlinesize);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3483 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3484 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3485
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3486 static inline void xchg_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg){
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3487 MpegEncContext * const s = &h->s;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3488 int temp8, i;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3489 uint64_t temp64;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3490 int deblock_left = (s->mb_x > 0);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3491 int deblock_top = (s->mb_y > 0);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3492
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3493 src_y -= linesize + 1;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3494 src_cb -= uvlinesize + 1;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3495 src_cr -= uvlinesize + 1;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3496
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3497 #define XCHG(a,b,t,xchg)\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3498 t= a;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3499 if(xchg)\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3500 a= b;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3501 b= t;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3502
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3503 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3504 for(i = !deblock_top; i<17; i++){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3505 XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3506 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3507 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3508
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3509 if(deblock_top){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3510 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3511 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1);
2803
26970df644f1 Add missing +1 in bounds check.
reimar
parents: 2793
diff changeset
3512 if(s->mb_x+1 < s->mb_width){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3513 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3514 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3515 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3516
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3517 if(!(s->flags&CODEC_FLAG_GRAY)){
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3518 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3519 for(i = !deblock_top; i<9; i++){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3520 XCHG(h->left_border[i+17 ], src_cb[i*uvlinesize], temp8, xchg);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3521 XCHG(h->left_border[i+17+9], src_cr[i*uvlinesize], temp8, xchg);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3522 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3523 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3524 if(deblock_top){
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3525 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3526 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3527 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3528 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3529 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3530
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3531 static inline void backup_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3532 MpegEncContext * const s = &h->s;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3533 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3534
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3535 src_y -= 2 * linesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3536 src_cb -= 2 * uvlinesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3537 src_cr -= 2 * uvlinesize;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3538
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3539 // There are two lines saved, the line above the the top macroblock of a pair,
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3540 // and the line above the bottom macroblock
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3541 h->left_border[0]= h->top_borders[0][s->mb_x][15];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3542 h->left_border[1]= h->top_borders[1][s->mb_x][15];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3543 for(i=2; i<34; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3544 h->left_border[i]= src_y[15+i* linesize];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3545 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3546
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3547 *(uint64_t*)(h->top_borders[0][s->mb_x]+0)= *(uint64_t*)(src_y + 32*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3548 *(uint64_t*)(h->top_borders[0][s->mb_x]+8)= *(uint64_t*)(src_y +8+32*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3549 *(uint64_t*)(h->top_borders[1][s->mb_x]+0)= *(uint64_t*)(src_y + 33*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3550 *(uint64_t*)(h->top_borders[1][s->mb_x]+8)= *(uint64_t*)(src_y +8+33*linesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3551
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3552 if(!(s->flags&CODEC_FLAG_GRAY)){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3553 h->left_border[34 ]= h->top_borders[0][s->mb_x][16+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3554 h->left_border[34+ 1]= h->top_borders[1][s->mb_x][16+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3555 h->left_border[34+18 ]= h->top_borders[0][s->mb_x][24+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3556 h->left_border[34+18+1]= h->top_borders[1][s->mb_x][24+7];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3557 for(i=2; i<18; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3558 h->left_border[i+34 ]= src_cb[7+i*uvlinesize];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3559 h->left_border[i+34+18]= src_cr[7+i*uvlinesize];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3560 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3561 *(uint64_t*)(h->top_borders[0][s->mb_x]+16)= *(uint64_t*)(src_cb+16*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3562 *(uint64_t*)(h->top_borders[0][s->mb_x]+24)= *(uint64_t*)(src_cr+16*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3563 *(uint64_t*)(h->top_borders[1][s->mb_x]+16)= *(uint64_t*)(src_cb+17*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3564 *(uint64_t*)(h->top_borders[1][s->mb_x]+24)= *(uint64_t*)(src_cr+17*uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3565 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3566 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3567
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3568 static inline void xchg_pair_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3569 MpegEncContext * const s = &h->s;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3570 int temp8, i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3571 uint64_t temp64;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3572 int deblock_left = (s->mb_x > 0);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3573 int deblock_top = (s->mb_y > 1);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3574
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3575 tprintf("xchg_pair_border: src_y:%p src_cb:%p src_cr:%p ls:%d uvls:%d\n", src_y, src_cb, src_cr, linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3576
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3577 src_y -= 2 * linesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3578 src_cb -= 2 * uvlinesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3579 src_cr -= 2 * uvlinesize + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3580
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3581 #define XCHG(a,b,t,xchg)\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3582 t= a;\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3583 if(xchg)\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3584 a= b;\
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3585 b= t;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3586
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3587 if(deblock_left){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3588 for(i = (!deblock_top)<<1; i<34; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3589 XCHG(h->left_border[i ], src_y [i* linesize], temp8, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3590 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3591 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3592
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3593 if(deblock_top){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3594 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3595 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3596 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+0), *(uint64_t*)(src_y +1 +linesize), temp64, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3597 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+8), *(uint64_t*)(src_y +9 +linesize), temp64, 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3598 if(s->mb_x+1 < s->mb_width){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3599 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x+1]), *(uint64_t*)(src_y +17), temp64, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3600 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x+1]), *(uint64_t*)(src_y +17 +linesize), temp64, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3601 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3602 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3603
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3604 if(!(s->flags&CODEC_FLAG_GRAY)){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3605 if(deblock_left){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3606 for(i = (!deblock_top) << 1; i<18; i++){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3607 XCHG(h->left_border[i+34 ], src_cb[i*uvlinesize], temp8, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3608 XCHG(h->left_border[i+34+18], src_cr[i*uvlinesize], temp8, xchg);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3609 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3610 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3611 if(deblock_top){
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3612 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3613 XCHG(*(uint64_t*)(h->top_borders[0][s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3614 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+16), *(uint64_t*)(src_cb+1 +uvlinesize), temp64, 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3615 XCHG(*(uint64_t*)(h->top_borders[1][s->mb_x]+24), *(uint64_t*)(src_cr+1 +uvlinesize), temp64, 1);
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
3616 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3617 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3618 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3619
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3620 static void hl_decode_mb(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3621 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3622 const int mb_x= s->mb_x;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3623 const int mb_y= s->mb_y;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
3624 const int mb_xy= mb_x + mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3625 const int mb_type= s->current_picture.mb_type[mb_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3626 uint8_t *dest_y, *dest_cb, *dest_cr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3627 int linesize, uvlinesize /*dct_offset*/;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3628 int i;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3629 int *block_offset = &h->block_offset[0];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3630 const unsigned int bottom = mb_y & 1;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3631 const int transform_bypass = (s->qscale == 0 && h->sps.transform_bypass);
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3632 void (*idct_add)(uint8_t *dst, DCTELEM *block, int stride);
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3633 void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3634
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3635 if(!s->decode)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3636 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3637
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3638 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3639 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3640 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3641
4000
eeab02251056 more prefetches, 2% faster h264
lorenm
parents: 3993
diff changeset
3642 s->dsp.prefetch(dest_y + (s->mb_x&3)*4*s->linesize + 64, s->linesize, 4);
eeab02251056 more prefetches, 2% faster h264
lorenm
parents: 3993
diff changeset
3643 s->dsp.prefetch(dest_cb + (s->mb_x&7)*s->uvlinesize + 64, dest_cr - dest_cb, 2);
eeab02251056 more prefetches, 2% faster h264
lorenm
parents: 3993
diff changeset
3644
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3645 if (MB_FIELD) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3646 linesize = h->mb_linesize = s->linesize * 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3647 uvlinesize = h->mb_uvlinesize = s->uvlinesize * 2;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3648 block_offset = &h->block_offset[24];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3649 if(mb_y&1){ //FIXME move out of this func?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3650 dest_y -= s->linesize*15;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3651 dest_cb-= s->uvlinesize*7;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3652 dest_cr-= s->uvlinesize*7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3653 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3654 if(FRAME_MBAFF) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3655 int list;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3656 for(list=0; list<2; list++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3657 if(!USES_LIST(mb_type, list))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3658 continue;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3659 if(IS_16X16(mb_type)){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3660 int8_t *ref = &h->ref_cache[list][scan8[0]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3661 fill_rectangle(ref, 4, 4, 8, 16+*ref^(s->mb_y&1), 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3662 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3663 for(i=0; i<16; i+=4){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3664 //FIXME can refs be smaller than 8x8 when !direct_8x8_inference ?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3665 int ref = h->ref_cache[list][scan8[i]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3666 if(ref >= 0)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3667 fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2, 8, 16+ref^(s->mb_y&1), 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3668 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3669 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3670 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3671 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3672 } else {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3673 linesize = h->mb_linesize = s->linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3674 uvlinesize = h->mb_uvlinesize = s->uvlinesize;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3675 // dct_offset = s->linesize * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3676 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3677
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3678 if(transform_bypass){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3679 idct_dc_add =
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3680 idct_add = IS_8x8DCT(mb_type) ? s->dsp.add_pixels8 : s->dsp.add_pixels4;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3681 }else if(IS_8x8DCT(mb_type)){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3682 idct_dc_add = s->dsp.h264_idct8_dc_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3683 idct_add = s->dsp.h264_idct8_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3684 }else{
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3685 idct_dc_add = s->dsp.h264_idct_dc_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3686 idct_add = s->dsp.h264_idct_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3687 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3688
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3689 if(FRAME_MBAFF && h->deblocking_filter && IS_INTRA(mb_type)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3690 && (!bottom || !IS_INTRA(s->current_picture.mb_type[mb_xy-s->mb_stride]))){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3691 int mbt_y = mb_y&~1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3692 uint8_t *top_y = s->current_picture.data[0] + (mbt_y * 16* s->linesize ) + mb_x * 16;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3693 uint8_t *top_cb = s->current_picture.data[1] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3694 uint8_t *top_cr = s->current_picture.data[2] + (mbt_y * 8 * s->uvlinesize) + mb_x * 8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3695 xchg_pair_border(h, top_y, top_cb, top_cr, s->linesize, s->uvlinesize, 1);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3696 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3697
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3698 if (IS_INTRA_PCM(mb_type)) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3699 unsigned int x, y;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3700
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3701 // The pixels are stored in h->mb array in the same order as levels,
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3702 // copy them in output in the correct order.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3703 for(i=0; i<16; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3704 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3705 for (x=0; x<4; x++) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3706 *(dest_y + block_offset[i] + y*linesize + x) = h->mb[i*16+y*4+x];
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3707 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3708 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3709 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3710 for(i=16; i<16+4; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3711 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3712 for (x=0; x<4; x++) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3713 *(dest_cb + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x];
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3714 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3715 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3716 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3717 for(i=20; i<20+4; i++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3718 for (y=0; y<4; y++) {
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3719 for (x=0; x<4; x++) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3720 *(dest_cr + block_offset[i] + y*uvlinesize + x) = h->mb[i*16+y*4+x];
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3721 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3722 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
3723 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3724 } else {
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3725 if(IS_INTRA(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3726 if(h->deblocking_filter && !FRAME_MBAFF)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3727 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3728
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3729 if(!(s->flags&CODEC_FLAG_GRAY)){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3730 h->pred8x8[ h->chroma_pred_mode ](dest_cb, uvlinesize);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3731 h->pred8x8[ h->chroma_pred_mode ](dest_cr, uvlinesize);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3732 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3733
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3734 if(IS_INTRA4x4(mb_type)){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3735 if(!s->encoding){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3736 if(IS_8x8DCT(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3737 for(i=0; i<16; i+=4){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3738 uint8_t * const ptr= dest_y + block_offset[i];
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3739 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3740 const int nnz = h->non_zero_count_cache[ scan8[i] ];
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3741 h->pred8x8l[ dir ](ptr, (h->topleft_samples_available<<i)&0x8000,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3742 (h->topright_samples_available<<(i+1))&0x8000, linesize);
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3743 if(nnz){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3744 if(nnz == 1 && h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3745 idct_dc_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3746 else
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3747 idct_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3748 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3749 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
3750 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3751 for(i=0; i<16; i++){
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3752 uint8_t * const ptr= dest_y + block_offset[i];
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3753 uint8_t *topright;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3754 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3755 int nnz, tr;
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3756
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3757 if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3758 const int topright_avail= (h->topright_samples_available<<i)&0x8000;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3759 assert(mb_y || linesize <= block_offset[i]);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3760 if(!topright_avail){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3761 tr= ptr[3 - linesize]*0x01010101;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3762 topright= (uint8_t*) &tr;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3763 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3764 topright= ptr + 4 - linesize;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3765 }else
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3766 topright= NULL;
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3767
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3768 h->pred4x4[ dir ](ptr, topright, linesize);
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3769 nnz = h->non_zero_count_cache[ scan8[i] ];
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3770 if(nnz){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3771 if(s->codec_id == CODEC_ID_H264){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3772 if(nnz == 1 && h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3773 idct_dc_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3774 else
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3775 idct_add(ptr, h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3776 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3777 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3778 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3779 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3780 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3781 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3782 h->pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize);
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3783 if(s->codec_id == CODEC_ID_H264){
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3784 if(!transform_bypass)
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3785 h264_luma_dc_dequant_idct_c(h->mb, s->qscale, h->dequant4_coeff[IS_INTRA(mb_type) ? 0:3][s->qscale][0]);
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3786 }else
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3787 svq3_luma_dc_dequant_idct_c(h->mb, s->qscale);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3788 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3789 if(h->deblocking_filter && !FRAME_MBAFF)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3790 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3791 }else if(s->codec_id == CODEC_ID_H264){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3792 hl_motion(h, dest_y, dest_cb, dest_cr,
3807
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
3793 s->me.qpel_put, s->dsp.put_h264_chroma_pixels_tab,
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
3794 s->me.qpel_avg, s->dsp.avg_h264_chroma_pixels_tab,
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3795 s->dsp.weight_h264_pixels_tab, s->dsp.biweight_h264_pixels_tab);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3796 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3797
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3798
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3799 if(!IS_INTRA4x4(mb_type)){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3800 if(s->codec_id == CODEC_ID_H264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3801 if(IS_INTRA16x16(mb_type)){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3802 for(i=0; i<16; i++){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3803 if(h->non_zero_count_cache[ scan8[i] ])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3804 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3805 else if(h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3806 idct_dc_add(dest_y + block_offset[i], h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3807 }
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3808 }else{
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3809 const int di = IS_8x8DCT(mb_type) ? 4 : 1;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3810 for(i=0; i<16; i+=di){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3811 int nnz = h->non_zero_count_cache[ scan8[i] ];
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3812 if(nnz){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3813 if(nnz==1 && h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3814 idct_dc_add(dest_y + block_offset[i], h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3815 else
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3816 idct_add(dest_y + block_offset[i], h->mb + i*16, linesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3817 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3818 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3819 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3820 }else{
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3821 for(i=0; i<16; i++){
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3822 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
3823 uint8_t * const ptr= dest_y + block_offset[i];
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3824 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
3825 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3826 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3827 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3828 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3829
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3830 if(!(s->flags&CODEC_FLAG_GRAY)){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3831 uint8_t *dest[2] = {dest_cb, dest_cr};
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3832 if(transform_bypass){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3833 idct_add = idct_dc_add = s->dsp.add_pixels4;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3834 }else{
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3835 idct_add = s->dsp.h264_idct_add;
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3836 idct_dc_add = s->dsp.h264_idct_dc_add;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3837 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp, h->dequant4_coeff[IS_INTRA(mb_type) ? 1:4][h->chroma_qp][0]);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
3838 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp, h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp][0]);
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
3839 }
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3840 if(s->codec_id == CODEC_ID_H264){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3841 for(i=16; i<16+8; i++){
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3842 if(h->non_zero_count_cache[ scan8[i] ])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3843 idct_add(dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3844 else if(h->mb[i*16])
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3845 idct_dc_add(dest[(i&4)>>2] + block_offset[i], h->mb + i*16, uvlinesize);
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3846 }
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3847 }else{
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3848 for(i=16; i<16+8; i++){
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3849 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
3850 uint8_t * const ptr= dest[(i&4)>>2] + block_offset[i];
2509
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3851 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2);
b3b06ba8787c remove goto and reindent patch by (Loic Le Loarer <lll+ffmpeg m4x org>)
michael
parents: 2504
diff changeset
3852 }
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
3853 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3854 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3855 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3856 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3857 if(h->deblocking_filter) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3858 if (FRAME_MBAFF) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3859 //FIXME try deblocking one mb at a time?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3860 // the reduction in load/storing mvs and such might outweigh the extra backup/xchg_border
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3861 const int mb_y = s->mb_y - 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3862 uint8_t *pair_dest_y, *pair_dest_cb, *pair_dest_cr;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3863 const int mb_xy= mb_x + mb_y*s->mb_stride;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3864 const int mb_type_top = s->current_picture.mb_type[mb_xy];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3865 const int mb_type_bottom= s->current_picture.mb_type[mb_xy+s->mb_stride];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3866 if (!bottom) return;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3867 pair_dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3868 pair_dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3869 pair_dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3870
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3871 if(IS_INTRA(mb_type_top | mb_type_bottom))
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3872 xchg_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize, 0);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3873
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3874 backup_pair_border(h, pair_dest_y, pair_dest_cb, pair_dest_cr, s->linesize, s->uvlinesize);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3875 // deblock a pair
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3876 // top
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3877 s->mb_y--;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3878 tprintf("call mbaff filter_mb mb_x:%d mb_y:%d pair_dest_y = %p, dest_y = %p\n", mb_x, mb_y, pair_dest_y, dest_y);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3879 fill_caches(h, mb_type_top, 1); //FIXME don't fill stuff which isn't used by filter_mb
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3880 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mb_xy]);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3881 filter_mb(h, mb_x, mb_y, pair_dest_y, pair_dest_cb, pair_dest_cr, linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3882 // bottom
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3883 s->mb_y++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3884 tprintf("call mbaff filter_mb\n");
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3885 fill_caches(h, mb_type_bottom, 1); //FIXME don't fill stuff which isn't used by filter_mb
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
3886 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mb_xy+s->mb_stride]);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3887 filter_mb(h, mb_x, mb_y+1, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3888 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3889 tprintf("call filter_mb\n");
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3890 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
3891 fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
3892 filter_mb_fast(h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
3893 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3894 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3895 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3896
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3897 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3898 * fills the default_ref_list.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3899 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3900 static int fill_default_ref_list(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3901 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3902 int i;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3903 int smallest_poc_greater_than_current = -1;
2582
3c27a074de7a allow 16 refs with B-frames
lorenm
parents: 2581
diff changeset
3904 Picture sorted_short_ref[32];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3905
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3906 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3907 int out_i;
2713
16258de8ae06 fix crash on negative POC
lorenm
parents: 2707
diff changeset
3908 int limit= INT_MIN;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3909
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3910 /* sort frame according to poc in B slice */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3911 for(out_i=0; out_i<h->short_ref_count; out_i++){
2713
16258de8ae06 fix crash on negative POC
lorenm
parents: 2707
diff changeset
3912 int best_i=INT_MIN;
2255
507690ff49a2 assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2254
diff changeset
3913 int best_poc=INT_MAX;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3914
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3915 for(i=0; i<h->short_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3916 const int poc= h->short_ref[i]->poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3917 if(poc > limit && poc < best_poc){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3918 best_poc= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3919 best_i= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3920 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3921 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3922
2713
16258de8ae06 fix crash on negative POC
lorenm
parents: 2707
diff changeset
3923 assert(best_i != INT_MIN);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3924
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3925 limit= best_poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3926 sorted_short_ref[out_i]= *h->short_ref[best_i];
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3927 tprintf("sorted poc: %d->%d poc:%d fn:%d\n", best_i, out_i, sorted_short_ref[out_i].poc, sorted_short_ref[out_i].frame_num);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3928 if (-1 == smallest_poc_greater_than_current) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3929 if (h->short_ref[best_i]->poc >= s->current_picture_ptr->poc) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3930 smallest_poc_greater_than_current = out_i;
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3931 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3932 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3933 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3934 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3935
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3936 if(s->picture_structure == PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3937 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3938 int list;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3939 tprintf("current poc: %d, smallest_poc_greater_than_current: %d\n", s->current_picture_ptr->poc, smallest_poc_greater_than_current);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3940
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3941 // find the largest poc
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3942 for(list=0; list<2; list++){
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3943 int index = 0;
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3944 int j= -99;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3945 int step= list ? -1 : 1;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3946
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3947 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++, j+=step) {
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3948 while(j<0 || j>= h->short_ref_count){
2680
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3949 if(j != -99 && step == (list ? -1 : 1))
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
3950 return -1;
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3951 step = -step;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3952 j= smallest_poc_greater_than_current + (step>>1);
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3953 }
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3954 if(sorted_short_ref[j].reference != 3) continue;
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3955 h->default_ref_list[list][index ]= sorted_short_ref[j];
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3956 h->default_ref_list[list][index++].pic_id= sorted_short_ref[j].frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3957 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3958
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3959 for(i = 0; i < 16 && index < h->ref_count[ list ]; i++){
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3960 if(h->long_ref[i] == NULL) continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3961 if(h->long_ref[i]->reference != 3) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3962
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3963 h->default_ref_list[ list ][index ]= *h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3964 h->default_ref_list[ list ][index++].pic_id= i;;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3965 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
3966
2447
0237bb5ca0f0 simplify
michael
parents: 2441
diff changeset
3967 if(list && (smallest_poc_greater_than_current<=0 || smallest_poc_greater_than_current>=h->short_ref_count) && (1 < index)){
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3968 // swap the two first elements of L1 when
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3969 // L0 and L1 are identical
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3970 Picture temp= h->default_ref_list[1][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3971 h->default_ref_list[1][0] = h->default_ref_list[1][1];
2673
6f04c7a5bf24 typo found by Chengji Zhao
michael
parents: 2669
diff changeset
3972 h->default_ref_list[1][1] = temp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3973 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3974
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3975 if(index < h->ref_count[ list ])
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3976 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3977 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3978 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3979 int index=0;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3980 for(i=0; i<h->short_ref_count; i++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3981 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3982 h->default_ref_list[0][index ]= *h->short_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3983 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3984 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
3985 for(i = 0; i < 16; i++){
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
3986 if(h->long_ref[i] == NULL) continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3987 if(h->long_ref[i]->reference != 3) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3988 h->default_ref_list[0][index ]= *h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3989 h->default_ref_list[0][index++].pic_id= i;;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3990 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3991 if(index < h->ref_count[0])
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3992 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3993 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3994 }else{ //FIELD
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3995 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3996 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3997 //FIXME second field balh
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3998 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3999 }
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4000 #ifdef TRACE
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4001 for (i=0; i<h->ref_count[0]; i++) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4002 tprintf("List0: %s fn:%d 0x%p\n", (h->default_ref_list[0][i].long_ref ? "LT" : "ST"), h->default_ref_list[0][i].pic_id, h->default_ref_list[0][i].data[0]);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4003 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4004 if(h->slice_type==B_TYPE){
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4005 for (i=0; i<h->ref_count[1]; i++) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4006 tprintf("List1: %s fn:%d 0x%p\n", (h->default_ref_list[1][i].long_ref ? "LT" : "ST"), h->default_ref_list[1][i].pic_id, h->default_ref_list[0][i].data[0]);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4007 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4008 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4009 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4010 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4011 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4012
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4013 static void print_short_term(H264Context *h);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4014 static void print_long_term(H264Context *h);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4015
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4016 static int decode_ref_pic_list_reordering(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4017 MpegEncContext * const s = &h->s;
2680
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
4018 int list, index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4019
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4020 print_short_term(h);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4021 print_long_term(h);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4022 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move before func
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4023
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4024 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4025 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4026
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4027 if(get_bits1(&s->gb)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4028 int pred= h->curr_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4029
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4030 for(index=0; ; index++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4031 int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4032 int pic_id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4033 int i;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
4034 Picture *ref = NULL;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4035
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4036 if(reordering_of_pic_nums_idc==3)
2284
6d26e105f68f h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2272
diff changeset
4037 break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4038
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4039 if(index >= h->ref_count[list]){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4040 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4041 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4042 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4043
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4044 if(reordering_of_pic_nums_idc<3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4045 if(reordering_of_pic_nums_idc<2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4046 const int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4047
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4048 if(abs_diff_pic_num >= h->max_pic_num){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4049 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4050 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4051 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4052
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4053 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4054 else pred+= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4055 pred &= h->max_pic_num - 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4056
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4057 for(i= h->short_ref_count-1; i>=0; i--){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4058 ref = h->short_ref[i];
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4059 assert(ref->reference == 3);
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4060 assert(!ref->long_ref);
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4061 if(ref->data[0] != NULL && ref->frame_num == pred && ref->long_ref == 0) // ignore non existing pictures by testing data[0] pointer
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4062 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4063 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4064 if(i>=0)
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4065 ref->pic_id= ref->frame_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4066 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4067 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4068 ref = h->long_ref[pic_id];
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4069 ref->pic_id= pic_id;
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4070 assert(ref->reference == 3);
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4071 assert(ref->long_ref);
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4072 i=0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4073 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4074
2485
2844b8cf4e11 H.264 multiplce instance in reference list patch by (Loic <lll+ffmpeg m4x org )
michael
parents: 2484
diff changeset
4075 if (i < 0) {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4076 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4077 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4078 } else {
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4079 for(i=index; i+1<h->ref_count[list]; i++){
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4080 if(ref->long_ref == h->ref_list[list][i].long_ref && ref->pic_id == h->ref_list[list][i].pic_id)
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4081 break;
2650
d321fbf0b2ce reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents: 2649
diff changeset
4082 }
d321fbf0b2ce reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents: 2649
diff changeset
4083 for(; i > index; i--){
d321fbf0b2ce reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents: 2649
diff changeset
4084 h->ref_list[list][i]= h->ref_list[list][i-1];
d321fbf0b2ce reverse 1 hunk from 1.96->1.97, fixes decoding of (MR1_BT_A.h264 and MR1_MW_A.264)
michael
parents: 2649
diff changeset
4085 }
2683
7d86ebbccecf another try at decode_ref_pic_list_reordering()
michael
parents: 2680
diff changeset
4086 h->ref_list[list][index]= *ref;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4087 }
2284
6d26e105f68f h.264 ref list reordering bugfix patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2272
diff changeset
4088 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4089 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4090 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4091 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4092 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4093 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4094
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4095 if(h->slice_type!=B_TYPE) break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4096 }
2680
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
4097 for(list=0; list<2; list++){
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
4098 for(index= 0; index < h->ref_count[list]; index++){
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
4099 if(!h->ref_list[list][index].data[0])
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
4100 h->ref_list[list][index]= s->current_picture;
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
4101 }
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
4102 if(h->slice_type!=B_TYPE) break;
1a6192e0b1f9 fill missing reference pictures with something to avoid assertion failure
michael
parents: 2675
diff changeset
4103 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4104
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4105 if(h->slice_type==B_TYPE && !h->direct_spatial_mv_pred)
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
4106 direct_dist_scale_factor(h);
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
4107 direct_ref_list_init(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4108 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4109 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4110
3379
69901769c811 fill_mbaff_ref_list is missing a return statement, its return value
mru
parents: 3341
diff changeset
4111 static void fill_mbaff_ref_list(H264Context *h){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4112 int list, i, j;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4113 for(list=0; list<2; list++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4114 for(i=0; i<h->ref_count[list]; i++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4115 Picture *frame = &h->ref_list[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4116 Picture *field = &h->ref_list[list][16+2*i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4117 field[0] = *frame;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4118 for(j=0; j<3; j++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4119 field[0].linesize[j] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4120 field[1] = field[0];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4121 for(j=0; j<3; j++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4122 field[1].data[j] += frame->linesize[j];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4123
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4124 h->luma_weight[list][16+2*i] = h->luma_weight[list][16+2*i+1] = h->luma_weight[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4125 h->luma_offset[list][16+2*i] = h->luma_offset[list][16+2*i+1] = h->luma_offset[list][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4126 for(j=0; j<2; j++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4127 h->chroma_weight[list][16+2*i][j] = h->chroma_weight[list][16+2*i+1][j] = h->chroma_weight[list][i][j];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4128 h->chroma_offset[list][16+2*i][j] = h->chroma_offset[list][16+2*i+1][j] = h->chroma_offset[list][i][j];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4129 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4130 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4131 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4132 for(j=0; j<h->ref_count[1]; j++){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4133 for(i=0; i<h->ref_count[0]; i++)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4134 h->implicit_weight[j][16+2*i] = h->implicit_weight[j][16+2*i+1] = h->implicit_weight[j][i];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4135 memcpy(h->implicit_weight[16+2*j], h->implicit_weight[j], sizeof(*h->implicit_weight));
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4136 memcpy(h->implicit_weight[16+2*j+1], h->implicit_weight[j], sizeof(*h->implicit_weight));
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4137 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4138 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4139
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4140 static int pred_weight_table(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4141 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4142 int list, i;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4143 int luma_def, chroma_def;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4144
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4145 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4146 h->use_weight_chroma= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4147 h->luma_log2_weight_denom= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4148 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4149 luma_def = 1<<h->luma_log2_weight_denom;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4150 chroma_def = 1<<h->chroma_log2_weight_denom;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4151
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4152 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4153 for(i=0; i<h->ref_count[list]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4154 int luma_weight_flag, chroma_weight_flag;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4155
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4156 luma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4157 if(luma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4158 h->luma_weight[list][i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4159 h->luma_offset[list][i]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4160 if( h->luma_weight[list][i] != luma_def
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4161 || h->luma_offset[list][i] != 0)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4162 h->use_weight= 1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4163 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4164 h->luma_weight[list][i]= luma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4165 h->luma_offset[list][i]= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4166 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4167
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4168 chroma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4169 if(chroma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4170 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4171 for(j=0; j<2; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4172 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4173 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4174 if( h->chroma_weight[list][i][j] != chroma_def
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4175 || h->chroma_offset[list][i][j] != 0)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4176 h->use_weight_chroma= 1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4177 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4178 }else{
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4179 int j;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4180 for(j=0; j<2; j++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4181 h->chroma_weight[list][i][j]= chroma_def;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4182 h->chroma_offset[list][i][j]= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4183 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4184 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4185 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4186 if(h->slice_type != B_TYPE) break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4187 }
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4188 h->use_weight= h->use_weight || h->use_weight_chroma;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4189 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4190 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4191
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4192 static void implicit_weight_table(H264Context *h){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4193 MpegEncContext * const s = &h->s;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4194 int ref0, ref1;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4195 int cur_poc = s->current_picture_ptr->poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4196
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4197 if( h->ref_count[0] == 1 && h->ref_count[1] == 1
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4198 && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4199 h->use_weight= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4200 h->use_weight_chroma= 0;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4201 return;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4202 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4203
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4204 h->use_weight= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4205 h->use_weight_chroma= 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4206 h->luma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4207 h->chroma_log2_weight_denom= 5;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4208
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4209 for(ref0=0; ref0 < h->ref_count[0]; ref0++){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4210 int poc0 = h->ref_list[0][ref0].poc;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4211 for(ref1=0; ref1 < h->ref_count[1]; ref1++){
2519
b34f2cac6a71 10l in implicit_weight_table
lorenm
parents: 2509
diff changeset
4212 int poc1 = h->ref_list[1][ref1].poc;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4213 int td = clip(poc1 - poc0, -128, 127);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4214 if(td){
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4215 int tb = clip(cur_poc - poc0, -128, 127);
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
4216 int tx = (16384 + (FFABS(td) >> 1)) / td;
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4217 int dist_scale_factor = clip((tb*tx + 32) >> 6, -1024, 1023) >> 2;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4218 if(dist_scale_factor < -64 || dist_scale_factor > 128)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4219 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4220 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4221 h->implicit_weight[ref0][ref1] = 64 - dist_scale_factor;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4222 }else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4223 h->implicit_weight[ref0][ref1] = 32;
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4224 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4225 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4226 }
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4227
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4228 static inline void unreference_pic(H264Context *h, Picture *pic){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4229 int i;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4230 pic->reference=0;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4231 if(pic == h->delayed_output_pic)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4232 pic->reference=1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4233 else{
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4234 for(i = 0; h->delayed_pic[i]; i++)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4235 if(pic == h->delayed_pic[i]){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4236 pic->reference=1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4237 break;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4238 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4239 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4240 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4241
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4242 /**
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
4243 * instantaneous decoder refresh.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4244 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4245 static void idr(H264Context *h){
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4246 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4247
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
4248 for(i=0; i<16; i++){
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
4249 if (h->long_ref[i] != NULL) {
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4250 unreference_pic(h, h->long_ref[i]);
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
4251 h->long_ref[i]= NULL;
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
4252 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4253 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4254 h->long_ref_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4255
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4256 for(i=0; i<h->short_ref_count; i++){
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4257 unreference_pic(h, h->short_ref[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4258 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4259 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4260 h->short_ref_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4261 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4262
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
4263 /* forget old pics after a seek */
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
4264 static void flush_dpb(AVCodecContext *avctx){
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
4265 H264Context *h= avctx->priv_data;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
4266 int i;
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
4267 for(i=0; i<16; i++) {
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
4268 if(h->delayed_pic[i])
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
4269 h->delayed_pic[i]->reference= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
4270 h->delayed_pic[i]= NULL;
3144
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
4271 }
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
4272 if(h->delayed_output_pic)
84406a59134c fix a memory leak on seeking.
lorenm
parents: 3138
diff changeset
4273 h->delayed_output_pic->reference= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
4274 h->delayed_output_pic= NULL;
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
4275 idr(h);
2751
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
4276 if(h->s.current_picture_ptr)
3247049dfc7a fix segfault if flush is called before the first frame
mru
parents: 2748
diff changeset
4277 h->s.current_picture_ptr->reference= 0;
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
4278 }
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
4279
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4280 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4281 *
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4282 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4283 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4284 static Picture * remove_short(H264Context *h, int frame_num){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
4285 MpegEncContext * const s = &h->s;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4286 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4287
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
4288 if(s->avctx->debug&FF_DEBUG_MMCO)
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4289 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4290
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4291 for(i=0; i<h->short_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4292 Picture *pic= h->short_ref[i];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
4293 if(s->avctx->debug&FF_DEBUG_MMCO)
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4294 av_log(h->s.avctx, AV_LOG_DEBUG, "%d %d %p\n", i, pic->frame_num, pic);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4295 if(pic->frame_num == frame_num){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4296 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4297 memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4298 h->short_ref_count--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4299 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4300 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4301 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4302 return NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4303 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4304
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4305 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4306 *
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4307 * @return the removed picture or NULL if an error occurs
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4308 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4309 static Picture * remove_long(H264Context *h, int i){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4310 Picture *pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4311
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4312 pic= h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4313 h->long_ref[i]= NULL;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4314 if(pic) h->long_ref_count--;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4315
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4316 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4317 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4318
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4319 /**
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4320 * print short term list
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4321 */
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4322 static void print_short_term(H264Context *h) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4323 uint32_t i;
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4324 if(h->s.avctx->debug&FF_DEBUG_MMCO) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4325 av_log(h->s.avctx, AV_LOG_DEBUG, "short term list:\n");
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4326 for(i=0; i<h->short_ref_count; i++){
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4327 Picture *pic= h->short_ref[i];
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4328 av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n", i, pic->frame_num, pic->poc, pic->data[0]);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4329 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4330 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4331 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4332
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4333 /**
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4334 * print long term list
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4335 */
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4336 static void print_long_term(H264Context *h) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4337 uint32_t i;
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4338 if(h->s.avctx->debug&FF_DEBUG_MMCO) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4339 av_log(h->s.avctx, AV_LOG_DEBUG, "long term list:\n");
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4340 for(i = 0; i < 16; i++){
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4341 Picture *pic= h->long_ref[i];
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4342 if (pic) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4343 av_log(h->s.avctx, AV_LOG_DEBUG, "%d fn:%d poc:%d %p\n", i, pic->frame_num, pic->poc, pic->data[0]);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4344 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4345 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4346 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4347 }
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4348
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4349 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4350 * Executes the reference picture marking (memory management control operations).
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4351 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4352 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4353 MpegEncContext * const s = &h->s;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4354 int i, j;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4355 int current_is_long=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4356 Picture *pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4357
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4358 if((s->avctx->debug&FF_DEBUG_MMCO) && mmco_count==0)
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4359 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4360
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4361 for(i=0; i<mmco_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4362 if(s->avctx->debug&FF_DEBUG_MMCO)
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4363 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco:%d %d %d\n", h->mmco[i].opcode, h->mmco[i].short_frame_num, h->mmco[i].long_index);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4364
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4365 switch(mmco[i].opcode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4366 case MMCO_SHORT2UNUSED:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4367 pic= remove_short(h, mmco[i].short_frame_num);
2766
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4368 if(pic)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4369 unreference_pic(h, pic);
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4370 else if(s->avctx->debug&FF_DEBUG_MMCO)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4371 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_short() failure\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4372 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4373 case MMCO_SHORT2LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4374 pic= remove_long(h, mmco[i].long_index);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4375 if(pic) unreference_pic(h, pic);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4376
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4377 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4378 h->long_ref[ mmco[i].long_index ]->long_ref=1;
2484
a3188eb4266c correct long term picture management patch by (Loic <lll+ffmpeg m4x org>)
michael
parents: 2471
diff changeset
4379 h->long_ref_count++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4380 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4381 case MMCO_LONG2UNUSED:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4382 pic= remove_long(h, mmco[i].long_index);
2766
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4383 if(pic)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4384 unreference_pic(h, pic);
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4385 else if(s->avctx->debug&FF_DEBUG_MMCO)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4386 av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: remove_long() failure\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4387 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4388 case MMCO_LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4389 pic= remove_long(h, mmco[i].long_index);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4390 if(pic) unreference_pic(h, pic);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4391
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4392 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4393 h->long_ref[ mmco[i].long_index ]->long_ref=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4394 h->long_ref_count++;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4395
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4396 current_is_long=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4397 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4398 case MMCO_SET_MAX_LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4399 assert(mmco[i].long_index <= 16);
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4400 // just remove the long term which index is greater than new max
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4401 for(j = mmco[i].long_index; j<16; j++){
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4402 pic = remove_long(h, j);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4403 if (pic) unreference_pic(h, pic);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4404 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4405 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4406 case MMCO_RESET:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4407 while(h->short_ref_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4408 pic= remove_short(h, h->short_ref[0]->frame_num);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4409 unreference_pic(h, pic);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4410 }
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4411 for(j = 0; j < 16; j++) {
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4412 pic= remove_long(h, j);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4413 if(pic) unreference_pic(h, pic);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4414 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4415 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4416 default: assert(0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4417 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4418 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4419
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4420 if(!current_is_long){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4421 pic= remove_short(h, s->current_picture_ptr->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4422 if(pic){
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
4423 unreference_pic(h, pic);
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4424 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4425 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4426
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4427 if(h->short_ref_count)
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
4428 memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*));
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
4429
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
4430 h->short_ref[0]= s->current_picture_ptr;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4431 h->short_ref[0]->long_ref=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4432 h->short_ref_count++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4433 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4434
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4435 print_short_term(h);
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
4436 print_long_term(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4437 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4438 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4439
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4440 static int decode_ref_pic_marking(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4441 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4442 int i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4443
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4444 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4445 s->broken_link= get_bits1(&s->gb) -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4446 h->mmco[0].long_index= get_bits1(&s->gb) - 1; // current_long_term_idx
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4447 if(h->mmco[0].long_index == -1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4448 h->mmco_index= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4449 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4450 h->mmco[0].opcode= MMCO_LONG;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4451 h->mmco_index= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4452 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4453 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4454 if(get_bits1(&s->gb)){ // adaptive_ref_pic_marking_mode_flag
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4455 for(i= 0; i<MAX_MMCO_COUNT; i++) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4456 MMCOOpcode opcode= get_ue_golomb(&s->gb);;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4457
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4458 h->mmco[i].opcode= opcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4459 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4460 h->mmco[i].short_frame_num= (h->frame_num - get_ue_golomb(&s->gb) - 1) & ((1<<h->sps.log2_max_frame_num)-1); //FIXME fields
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4461 /* if(h->mmco[i].short_frame_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_frame_num ] == NULL){
2846
40765c51a7a9 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents: 2844
diff changeset
4462 av_log(s->avctx, AV_LOG_ERROR, "illegal short ref in memory management control operation %d\n", mmco);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4463 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4464 }*/
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4465 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4466 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4467 h->mmco[i].long_index= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4468 if(/*h->mmco[i].long_index >= h->long_ref_count || h->long_ref[ h->mmco[i].long_index ] == NULL*/ h->mmco[i].long_index >= 16){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4469 av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4470 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4471 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4472 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4473
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4474 if(opcode > MMCO_LONG){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4475 av_log(h->s.avctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4476 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4477 }
2255
507690ff49a2 assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2254
diff changeset
4478 if(opcode == MMCO_END)
507690ff49a2 assertion when playing AVC/H.264 streams fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2254
diff changeset
4479 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4480 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4481 h->mmco_index= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4482 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4483 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4484
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4485 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4486 h->mmco[0].opcode= MMCO_SHORT2UNUSED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4487 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4488 h->mmco_index= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4489 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4490 h->mmco_index= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4491 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4492 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4493
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4494 return 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4495 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4496
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4497 static int init_poc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4498 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4499 const int max_frame_num= 1<<h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4500 int field_poc[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4501
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4502 if(h->nal_unit_type == NAL_IDR_SLICE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4503 h->frame_num_offset= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4504 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4505 if(h->frame_num < h->prev_frame_num)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4506 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4507 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4508 h->frame_num_offset= h->prev_frame_num_offset;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4509 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4510
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4511 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4512 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4513
2649
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
4514 if(h->nal_unit_type == NAL_IDR_SLICE){
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
4515 h->prev_poc_msb=
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
4516 h->prev_poc_lsb= 0;
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
4517 }
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
4518
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4519 if (h->poc_lsb < h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb >= max_poc_lsb/2)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4520 h->poc_msb = h->prev_poc_msb + max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4521 else if(h->poc_lsb > h->prev_poc_lsb && h->prev_poc_lsb - h->poc_lsb < -max_poc_lsb/2)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4522 h->poc_msb = h->prev_poc_msb - max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4523 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4524 h->poc_msb = h->prev_poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4525 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4526 field_poc[0] =
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4527 field_poc[1] = h->poc_msb + h->poc_lsb;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4528 if(s->picture_structure == PICT_FRAME)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4529 field_poc[1] += h->delta_poc_bottom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4530 }else if(h->sps.poc_type==1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4531 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4532 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4533
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4534 if(h->sps.poc_cycle_length != 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4535 abs_frame_num = h->frame_num_offset + h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4536 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4537 abs_frame_num = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4538
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4539 if(h->nal_ref_idc==0 && abs_frame_num > 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4540 abs_frame_num--;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4541
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4542 expected_delta_per_poc_cycle = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4543 for(i=0; i < h->sps.poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4544 expected_delta_per_poc_cycle += h->sps.offset_for_ref_frame[ i ]; //FIXME integrate during sps parse
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4545
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4546 if(abs_frame_num > 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4547 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4548 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4549
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4550 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4551 for(i = 0; i <= frame_num_in_poc_cycle; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4552 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4553 } else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4554 expectedpoc = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4555
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4556 if(h->nal_ref_idc == 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4557 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4558
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4559 field_poc[0] = expectedpoc + h->delta_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4560 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4561
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4562 if(s->picture_structure == PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4563 field_poc[1] += h->delta_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4564 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4565 int poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4566 if(h->nal_unit_type == NAL_IDR_SLICE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4567 poc= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4568 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4569 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4570 else poc= 2*(h->frame_num_offset + h->frame_num) - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4571 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4572 field_poc[0]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4573 field_poc[1]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4574 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4575
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4576 if(s->picture_structure != PICT_BOTTOM_FIELD)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4577 s->current_picture_ptr->field_poc[0]= field_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4578 if(s->picture_structure != PICT_TOP_FIELD)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4579 s->current_picture_ptr->field_poc[1]= field_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4580 if(s->picture_structure == PICT_FRAME) // FIXME field pix?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4581 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4582
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4583 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4584 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4585
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4586 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4587 * decodes a slice header.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4588 * this will allso call MPV_common_init() and frame_start() as needed
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4589 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4590 static int decode_slice_header(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4591 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4592 int first_mb_in_slice, pps_id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4593 int num_ref_idx_active_override_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4594 static const uint8_t slice_type_map[5]= {P_TYPE, B_TYPE, I_TYPE, SP_TYPE, SI_TYPE};
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4595 int slice_type;
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4596 int default_ref_list_done = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4597
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4598 s->current_picture.reference= h->nal_ref_idc != 0;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
4599 s->dropable= h->nal_ref_idc == 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4600
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4601 first_mb_in_slice= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4602
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4603 slice_type= get_ue_golomb(&s->gb);
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4604 if(slice_type > 9){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4605 av_log(h->s.avctx, AV_LOG_ERROR, "slice type too large (%d) at %d %d\n", h->slice_type, s->mb_x, s->mb_y);
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
4606 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4607 }
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4608 if(slice_type > 4){
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4609 slice_type -= 5;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4610 h->slice_type_fixed=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4611 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4612 h->slice_type_fixed=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4613
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4614 slice_type= slice_type_map[ slice_type ];
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4615 if (slice_type == I_TYPE
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4616 || (h->slice_num != 0 && slice_type == h->slice_type) ) {
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4617 default_ref_list_done = 1;
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4618 }
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4619 h->slice_type= slice_type;
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4620
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
4621 s->pict_type= h->slice_type; // to make a few old func happy, it's wrong though
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4622
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4623 pps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4624 if(pps_id>255){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4625 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4626 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4627 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4628 h->pps= h->pps_buffer[pps_id];
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
4629 if(h->pps.slice_group_count == 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4630 av_log(h->s.avctx, AV_LOG_ERROR, "non existing PPS referenced\n");
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
4631 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
4632 }
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
4633
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4634 h->sps= h->sps_buffer[ h->pps.sps_id ];
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
4635 if(h->sps.log2_max_frame_num == 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4636 av_log(h->s.avctx, AV_LOG_ERROR, "non existing SPS referenced\n");
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
4637 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
4638 }
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4639
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4640 if(h->dequant_coeff_pps != pps_id){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4641 h->dequant_coeff_pps = pps_id;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4642 init_dequant_tables(h);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4643 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4644
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4645 s->mb_width= h->sps.mb_width;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4646 s->mb_height= h->sps.mb_height * (2 - h->sps.frame_mbs_only_flag);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4647
3178
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
4648 h->b_stride= s->mb_width*4;
bd995b8c64fd Alignment fixes, caused problems on SPARC.
diego
parents: 3177
diff changeset
4649 h->b8_stride= s->mb_width*2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4650
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
4651 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right );
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4652 if(h->sps.frame_mbs_only_flag)
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
4653 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4654 else
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
4655 s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4656
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4657 if (s->context_initialized
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
4658 && ( s->width != s->avctx->width || s->height != s->avctx->height)) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4659 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4660 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4661 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4662 if (!s->context_initialized) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4663 if (MPV_common_init(s) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4664 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4665
2758
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4666 if(s->dsp.h264_idct_add == ff_h264_idct_add_c){ //FIXME little ugly
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4667 memcpy(h->zigzag_scan, zigzag_scan, 16*sizeof(uint8_t));
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4668 memcpy(h-> field_scan, field_scan, 16*sizeof(uint8_t));
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4669 }else{
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4670 int i;
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4671 for(i=0; i<16; i++){
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4672 #define T(x) (x>>2) | ((x<<2) & 0xF)
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4673 h->zigzag_scan[i] = T(zigzag_scan[i]);
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4674 h-> field_scan[i] = T( field_scan[i]);
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4675 #undef T
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4676 }
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4677 }
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4678 if(s->dsp.h264_idct8_add == ff_h264_idct8_add_c){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4679 memcpy(h->zigzag_scan8x8, zigzag_scan8x8, 64*sizeof(uint8_t));
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4680 memcpy(h->zigzag_scan8x8_cavlc, zigzag_scan8x8_cavlc, 64*sizeof(uint8_t));
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4681 memcpy(h->field_scan8x8, field_scan8x8, 64*sizeof(uint8_t));
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4682 memcpy(h->field_scan8x8_cavlc, field_scan8x8_cavlc, 64*sizeof(uint8_t));
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4683 }else{
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4684 int i;
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4685 for(i=0; i<64; i++){
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4686 #define T(x) (x>>3) | ((x&7)<<3)
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4687 h->zigzag_scan8x8[i] = T(zigzag_scan8x8[i]);
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4688 h->zigzag_scan8x8_cavlc[i] = T(zigzag_scan8x8_cavlc[i]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4689 h->field_scan8x8[i] = T(field_scan8x8[i]);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4690 h->field_scan8x8_cavlc[i] = T(field_scan8x8_cavlc[i]);
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4691 #undef T
2758
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4692 }
a7925aaeea1e 10l (dont read variables before they have been set)
michael
parents: 2757
diff changeset
4693 }
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4694 if(h->sps.transform_bypass){ //FIXME same ugly
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4695 h->zigzag_scan_q0 = zigzag_scan;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4696 h->zigzag_scan8x8_q0 = zigzag_scan8x8;
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4697 h->zigzag_scan8x8_cavlc_q0 = zigzag_scan8x8_cavlc;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4698 h->field_scan_q0 = field_scan;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4699 h->field_scan8x8_q0 = field_scan8x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4700 h->field_scan8x8_cavlc_q0 = field_scan8x8_cavlc;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4701 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4702 h->zigzag_scan_q0 = h->zigzag_scan;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4703 h->zigzag_scan8x8_q0 = h->zigzag_scan8x8;
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
4704 h->zigzag_scan8x8_cavlc_q0 = h->zigzag_scan8x8_cavlc;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4705 h->field_scan_q0 = h->field_scan;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4706 h->field_scan8x8_q0 = h->field_scan8x8;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4707 h->field_scan8x8_cavlc_q0 = h->field_scan8x8_cavlc;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
4708 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4709
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4710 alloc_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4711
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4712 s->avctx->width = s->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4713 s->avctx->height = s->height;
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
4714 s->avctx->sample_aspect_ratio= h->sps.sar;
2440
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
4715 if(!s->avctx->sample_aspect_ratio.den)
cf97353f94c6 div by zero aspect fix
michael
parents: 2422
diff changeset
4716 s->avctx->sample_aspect_ratio.den = 1;
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
4717
2648
c3a06b0b00e2 set time_base for variable fps too
michael
parents: 2645
diff changeset
4718 if(h->sps.timing_info_present_flag){
3052
6c3f87300378 interpret H264 VUI timing info correctly
mru
parents: 3036
diff changeset
4719 s->avctx->time_base= (AVRational){h->sps.num_units_in_tick * 2, h->sps.time_scale};
3063
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
4720 if(h->x264_build > 0 && h->x264_build < 44)
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
4721 s->avctx->time_base.den *= 2;
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
4722 av_reduce(&s->avctx->time_base.num, &s->avctx->time_base.den,
f02d0b59279c Remove all stray tabs and trailing whitespace, this time for good.
diego
parents: 3052
diff changeset
4723 s->avctx->time_base.num, s->avctx->time_base.den, 1<<30);
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
4724 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4725 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4726
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
4727 if(h->slice_num == 0){
2935
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
4728 if(frame_start(h) < 0)
b564bb15e63c check MPV_frame_start() return value
michael
parents: 2928
diff changeset
4729 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4730 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4731
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
4732 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4733 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4734
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4735 h->mb_mbaff = 0;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4736 h->mb_aff_frame = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4737 if(h->sps.frame_mbs_only_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4738 s->picture_structure= PICT_FRAME;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4739 }else{
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4740 if(get_bits1(&s->gb)) { //field_pic_flag
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4741 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4742 av_log(h->s.avctx, AV_LOG_ERROR, "PAFF interlacing is not implemented\n");
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4743 } else {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4744 s->picture_structure= PICT_FRAME;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4745 h->mb_aff_frame = h->sps.mb_aff;
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4746 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4747 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4748
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4749 s->resync_mb_x = s->mb_x = first_mb_in_slice % s->mb_width;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4750 s->resync_mb_y = s->mb_y = (first_mb_in_slice / s->mb_width) << h->mb_aff_frame;
2772
4d8010054ba9 check mb_y
michael
parents: 2771
diff changeset
4751 if(s->mb_y >= s->mb_height){
4d8010054ba9 check mb_y
michael
parents: 2771
diff changeset
4752 return -1;
4d8010054ba9 check mb_y
michael
parents: 2771
diff changeset
4753 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4754
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4755 if(s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4756 h->curr_pic_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4757 h->max_pic_num= 1<< h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4758 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4759 h->curr_pic_num= 2*h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4760 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4761 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4762
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4763 if(h->nal_unit_type == NAL_IDR_SLICE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4764 get_ue_golomb(&s->gb); /* idr_pic_id */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4765 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4766
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4767 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4768 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4769
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4770 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4771 h->delta_poc_bottom= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4772 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4773 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4774
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4775 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4776 h->delta_poc[0]= get_se_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4777
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4778 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4779 h->delta_poc[1]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4780 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4781
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4782 init_poc(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4783
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4784 if(h->pps.redundant_pic_cnt_present){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4785 h->redundant_pic_count= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4786 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4787
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4788 //set defaults, might be overriden a few line later
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4789 h->ref_count[0]= h->pps.ref_count[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4790 h->ref_count[1]= h->pps.ref_count[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4791
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4792 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4793 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4794 h->direct_spatial_mv_pred= get_bits1(&s->gb);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4795 if(h->sps.mb_aff && h->direct_spatial_mv_pred)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4796 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + spatial direct mode is not implemented\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4797 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4798 num_ref_idx_active_override_flag= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4799
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4800 if(num_ref_idx_active_override_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4801 h->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4802 if(h->slice_type==B_TYPE)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4803 h->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4804
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4805 if(h->ref_count[0] > 32 || h->ref_count[1] > 32){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
4806 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4807 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4808 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4809 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4810 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4811
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
4812 if(!default_ref_list_done){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4813 fill_default_ref_list(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4814 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4815
2766
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4816 if(decode_ref_pic_list_reordering(h) < 0)
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
4817 return -1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4818
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4819 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE ))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4820 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4821 pred_weight_table(h);
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4822 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE)
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4823 implicit_weight_table(h);
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4824 else
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4825 h->use_weight = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4826
2580
b4f6f89ec2f6 The cvs version 1.103 of h264.c brokes 13 conformance streams, this
michael
parents: 2561
diff changeset
4827 if(s->current_picture.reference)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4828 decode_ref_pic_marking(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4829
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4830 if(FRAME_MBAFF)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4831 fill_mbaff_ref_list(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4832
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4833 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE && h->pps.cabac )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4834 h->cabac_init_idc = get_ue_golomb(&s->gb);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4835
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4836 h->last_qscale_diff = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4837 s->qscale = h->pps.init_qp + get_se_golomb(&s->gb);
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4838 if(s->qscale<0 || s->qscale>51){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4839 av_log(s->avctx, AV_LOG_ERROR, "QP %d out of range\n", s->qscale);
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4840 return -1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4841 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
4842 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4843 //FIXME qscale / qp ... stuff
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4844 if(h->slice_type == SP_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4845 get_bits1(&s->gb); /* sp_for_switch_flag */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4846 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4847 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
4848 get_se_golomb(&s->gb); /* slice_qs_delta */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4849 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4850
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4851 h->deblocking_filter = 1;
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4852 h->slice_alpha_c0_offset = 0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4853 h->slice_beta_offset = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4854 if( h->pps.deblocking_filter_parameters_present ) {
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4855 h->deblocking_filter= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4856 if(h->deblocking_filter < 2)
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4857 h->deblocking_filter^= 1; // 1<->0
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4858
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
4859 if( h->deblocking_filter ) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4860 h->slice_alpha_c0_offset = get_se_golomb(&s->gb) << 1;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4861 h->slice_beta_offset = get_se_golomb(&s->gb) << 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4862 }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4863 }
2792
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
4864 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
4865 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type != I_TYPE)
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
4866 ||(s->avctx->skip_loop_filter >= AVDISCARD_BIDIR && h->slice_type == B_TYPE)
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
4867 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
4868 h->deblocking_filter= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4869
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4870 #if 0 //FMO
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4871 if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4872 slice_group_change_cycle= get_bits(&s->gb, ?);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4873 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4874
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
4875 h->slice_num++;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
4876
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4877 h->emu_edge_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4878 h->emu_edge_height= FRAME_MBAFF ? 0 : h->emu_edge_width;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
4879
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4880 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4881 av_log(h->s.avctx, AV_LOG_DEBUG, "slice:%d %s mb:%d %c pps:%d frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s\n",
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4882 h->slice_num,
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
4883 (s->picture_structure==PICT_FRAME ? "F" : s->picture_structure==PICT_TOP_FIELD ? "T" : "B"),
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4884 first_mb_in_slice,
1264
2fa34e615c76 cleanup
michaelni
parents: 1252
diff changeset
4885 av_get_pict_type_char(h->slice_type),
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4886 pps_id, h->frame_num,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4887 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4888 h->ref_count[0], h->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4889 s->qscale,
2583
61a08e2b9822 display deblocking strength in FF_DEBUG_PICT_INFO
lorenm
parents: 2582
diff changeset
4890 h->deblocking_filter, h->slice_alpha_c0_offset/2, h->slice_beta_offset/2,
2415
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4891 h->use_weight,
db2cf6005d19 H.264 weighted prediction.
lorenm
parents: 2410
diff changeset
4892 h->use_weight==1 && h->use_weight_chroma ? "c" : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4893 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4894 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4895
3807
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4896 if((s->avctx->flags2 & CODEC_FLAG2_FAST) && !s->current_picture.reference){
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4897 s->me.qpel_put= s->dsp.put_2tap_qpel_pixels_tab;
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4898 s->me.qpel_avg= s->dsp.avg_2tap_qpel_pixels_tab;
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4899 }else{
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4900 s->me.qpel_put= s->dsp.put_h264_qpel_pixels_tab;
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4901 s->me.qpel_avg= s->dsp.avg_h264_qpel_pixels_tab;
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4902 }
6a40092eb9e6 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast.
lorenm
parents: 3776
diff changeset
4903
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4904 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4905 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4906
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4907 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4908 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4909 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4910 static inline int get_level_prefix(GetBitContext *gb){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4911 unsigned int buf;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4912 int log;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4913
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4914 OPEN_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4915 UPDATE_CACHE(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4916 buf=GET_CACHE(re, gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4917
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4918 log= 32 - av_log2(buf);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4919 #ifdef TRACE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4920 print_bin(buf>>(32-log), log);
2272
cd43603c46f9 move h264 idct to its own file and call via function pointer in DspContext
michael
parents: 2255
diff changeset
4921 av_log(NULL, AV_LOG_DEBUG, "%5d %2d %3d lpr @%5d in %s get_level_prefix\n", buf>>(32-log), log, log-1, get_bits_count(gb), __FILE__);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4922 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4923
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4924 LAST_SKIP_BITS(re, gb, log);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4925 CLOSE_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4926
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4927 return log-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4928 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4929
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4930 static inline int get_dct8x8_allowed(H264Context *h){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4931 int i;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4932 for(i=0; i<4; i++){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4933 if(!IS_SUB_8X8(h->sub_mb_type[i])
2781
899a2ea0907c parenthesing to avoid compiler errors in the future - compared asm outputs, behaviour didnt changed
alex
parents: 2774
diff changeset
4934 || (!h->sps.direct_8x8_inference_flag && IS_DIRECT(h->sub_mb_type[i])))
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4935 return 0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4936 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4937 return 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4938 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
4939
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4940 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4941 * decodes a residual block.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4942 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4943 * @param scantable scantable
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4944 * @param max_coeff number of coefficients in the block
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4945 * @return <0 if an error occured
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4946 */
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
4947 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4948 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4949 static const int coeff_token_table_index[17]= {0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3};
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4950 int level[16];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4951 int zeros_left, coeff_num, coeff_token, total_coeff, i, j, trailing_ones, run_before;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4952
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4953 //FIXME put trailing_onex into the context
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4954
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4955 if(n == CHROMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4956 coeff_token= get_vlc2(gb, chroma_dc_coeff_token_vlc.table, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4957 total_coeff= coeff_token>>2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4958 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4959 if(n == LUMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4960 total_coeff= pred_non_zero_count(h, 0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4961 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4962 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4963 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4964 total_coeff= pred_non_zero_count(h, n);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4965 coeff_token= get_vlc2(gb, coeff_token_vlc[ coeff_token_table_index[total_coeff] ].table, COEFF_TOKEN_VLC_BITS, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4966 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4967 h->non_zero_count_cache[ scan8[n] ]= total_coeff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4968 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4969 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4970
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4971 //FIXME set last_non_zero?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4972
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4973 if(total_coeff==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4974 return 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4975
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4976 trailing_ones= coeff_token&3;
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
4977 tprintf("trailing:%d, total:%d\n", trailing_ones, total_coeff);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4978 assert(total_coeff<=16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
4979
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4980 for(i=0; i<trailing_ones; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4981 level[i]= 1 - 2*get_bits1(gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4982 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4983
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4984 if(i<total_coeff) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4985 int level_code, mask;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4986 int suffix_length = total_coeff > 10 && trailing_ones < 3;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4987 int prefix= get_level_prefix(gb);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4988
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
4989 //first coefficient has suffix_length equal to 0 or 1
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4990 if(prefix<14){ //FIXME try to build a large unified VLC table for all this
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4991 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4992 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4993 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4994 level_code= (prefix<<suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4995 }else if(prefix==14){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4996 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4997 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4998 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
4999 level_code= prefix + get_bits(gb, 4); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5000 }else if(prefix==15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5001 level_code= (prefix<<suffix_length) + get_bits(gb, 12); //part
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5002 if(suffix_length==0) level_code+=15; //FIXME doesn't make (much)sense
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5003 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5004 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5005 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5006 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5007
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5008 if(trailing_ones < 3) level_code += 2;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5009
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5010 suffix_length = 1;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5011 if(level_code > 5)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5012 suffix_length++;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5013 mask= -(level_code&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5014 level[i]= (((2+level_code)>>1) ^ mask) - mask;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5015 i++;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5016
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5017 //remaining coefficients have suffix_length > 0
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5018 for(;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5019 static const int suffix_limit[7] = {0,5,11,23,47,95,INT_MAX };
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5020 prefix = get_level_prefix(gb);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5021 if(prefix<15){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5022 level_code = (prefix<<suffix_length) + get_bits(gb, suffix_length);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5023 }else if(prefix==15){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5024 level_code = (prefix<<suffix_length) + get_bits(gb, 12);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5025 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5026 av_log(h->s.avctx, AV_LOG_ERROR, "prefix too large at %d %d\n", s->mb_x, s->mb_y);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5027 return -1;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5028 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5029 mask= -(level_code&1);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5030 level[i]= (((2+level_code)>>1) ^ mask) - mask;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5031 if(level_code > suffix_limit[suffix_length])
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5032 suffix_length++;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5033 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5034 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5035
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5036 if(total_coeff == max_coeff)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5037 zeros_left=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5038 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5039 if(n == CHROMA_DC_BLOCK_INDEX)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5040 zeros_left= get_vlc2(gb, chroma_dc_total_zeros_vlc[ total_coeff-1 ].table, CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5041 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5042 zeros_left= get_vlc2(gb, total_zeros_vlc[ total_coeff-1 ].table, TOTAL_ZEROS_VLC_BITS, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5043 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5044
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5045 coeff_num = zeros_left + total_coeff - 1;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5046 j = scantable[coeff_num];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5047 if(n > 24){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5048 block[j] = level[0];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5049 for(i=1;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5050 if(zeros_left <= 0)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5051 run_before = 0;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5052 else if(zeros_left < 7){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5053 run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5054 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5055 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5056 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5057 zeros_left -= run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5058 coeff_num -= 1 + run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5059 j= scantable[ coeff_num ];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5060
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5061 block[j]= level[i];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5062 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5063 }else{
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
5064 block[j] = (level[0] * qmul[j] + 32)>>6;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5065 for(i=1;i<total_coeff;i++) {
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5066 if(zeros_left <= 0)
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5067 run_before = 0;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5068 else if(zeros_left < 7){
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5069 run_before= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5070 }else{
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5071 run_before= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5072 }
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5073 zeros_left -= run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5074 coeff_num -= 1 + run_before;
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5075 j= scantable[ coeff_num ];
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5076
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
5077 block[j]= (level[i] * qmul[j] + 32)>>6;
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5078 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5079 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5080
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5081 if(zeros_left<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5082 av_log(h->s.avctx, AV_LOG_ERROR, "negative number of zero coeffs at %d %d\n", s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5083 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5084 }
2897
a5360f2a673e 13% faster decode_residual (cavlc).
lorenm
parents: 2891
diff changeset
5085
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5086 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5087 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5088
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5089 static void predict_field_decoding_flag(H264Context *h){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5090 MpegEncContext * const s = &h->s;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5091 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5092 int mb_type = (h->slice_table[mb_xy-1] == h->slice_num)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5093 ? s->current_picture.mb_type[mb_xy-1]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5094 : (h->slice_table[mb_xy-s->mb_stride] == h->slice_num)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5095 ? s->current_picture.mb_type[mb_xy-s->mb_stride]
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5096 : 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5097 h->mb_mbaff = h->mb_field_decoding_flag = IS_INTERLACED(mb_type) ? 1 : 0;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5098 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5099
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5100 /**
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5101 * decodes a P_SKIP or B_SKIP macroblock
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5102 */
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5103 static void decode_mb_skip(H264Context *h){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5104 MpegEncContext * const s = &h->s;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5105 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
5106 int mb_type=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5107
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5108 memset(h->non_zero_count[mb_xy], 0, 16);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5109 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5110
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5111 if(MB_FIELD)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5112 mb_type|= MB_TYPE_INTERLACED;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
5113
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5114 if( h->slice_type == B_TYPE )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5115 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5116 // just for fill_caches. pred_direct_motion will set the real mb_type
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
5117 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5118
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
5119 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ...
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5120 pred_direct_motion(h, &mb_type);
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
5121 mb_type|= MB_TYPE_SKIP;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5122 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5123 else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5124 {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5125 int mx, my;
2674
58fb8e1efcae 10l (mb_type uninitalized and then changed and overwritten)
michael
parents: 2673
diff changeset
5126 mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5127
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
5128 fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ...
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5129 pred_pskip_motion(h, &mx, &my);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5130 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5131 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5132 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5133
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5134 write_back_motion(h, mb_type);
3927
f44a3341bfdf simplify write_back_motion for skip mbs
lorenm
parents: 3807
diff changeset
5135 s->current_picture.mb_type[mb_xy]= mb_type;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5136 s->current_picture.qscale_table[mb_xy]= s->qscale;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5137 h->slice_table[ mb_xy ]= h->slice_num;
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
5138 h->prev_mb_skipped= 1;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5139 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5140
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5141 /**
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5142 * decodes a macroblock
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5143 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5144 */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5145 static int decode_mb_cavlc(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5146 MpegEncContext * const s = &h->s;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
5147 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
5148 int mb_type, partition_count, cbp;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5149 int dct8x8_allowed= h->pps.transform_8x8_mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5150
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5151 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5152
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
5153 tprintf("pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y);
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
5154 cbp = 0; /* avoid warning. FIXME: find a solution without slowing
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
5155 down the code */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5156 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5157 if(s->mb_skip_run==-1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5158 s->mb_skip_run= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5159
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5160 if (s->mb_skip_run--) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5161 if(FRAME_MBAFF && (s->mb_y&1) == 0){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5162 if(s->mb_skip_run==0)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5163 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5164 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5165 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5166 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5167 decode_mb_skip(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5168 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5169 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5170 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5171 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5172 if( (s->mb_y&1) == 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5173 h->mb_mbaff = h->mb_field_decoding_flag = get_bits1(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5174 }else
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
5175 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5176
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
5177 h->prev_mb_skipped= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5178
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5179 mb_type= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5180 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5181 if(mb_type < 23){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5182 partition_count= b_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5183 mb_type= b_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5184 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5185 mb_type -= 23;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5186 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5187 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5188 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5189 if(mb_type < 5){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5190 partition_count= p_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5191 mb_type= p_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5192 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5193 mb_type -= 5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5194 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5195 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5196 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5197 assert(h->slice_type == I_TYPE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5198 decode_intra_mb:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5199 if(mb_type > 25){
3954
00a12ef7d800 output typo fixes
diego
parents: 3948
diff changeset
5200 av_log(h->s.avctx, AV_LOG_ERROR, "mb_type %d in %c slice too large at %d %d\n", mb_type, av_get_pict_type_char(h->slice_type), s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5201 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5202 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5203 partition_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5204 cbp= i_mb_type_info[mb_type].cbp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5205 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5206 mb_type= i_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5207 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5208
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5209 if(MB_FIELD)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5210 mb_type |= MB_TYPE_INTERLACED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5211
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5212 h->slice_table[ mb_xy ]= h->slice_num;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5213
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5214 if(IS_INTRA_PCM(mb_type)){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5215 unsigned int x, y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5216
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5217 // we assume these blocks are very rare so we dont optimize it
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5218 align_get_bits(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5219
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5220 // The pixels are stored in the same order as levels in h->mb array.
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5221 for(y=0; y<16; y++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5222 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5223 for(x=0; x<16; x++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5224 tprintf("LUMA ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5225 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5226 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5227 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5228 for(y=0; y<8; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5229 const int index= 256 + 4*(y&3) + 32*(y>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5230 for(x=0; x<8; x++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5231 tprintf("CHROMA U ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5232 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5233 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5234 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5235 for(y=0; y<8; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5236 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5237 for(x=0; x<8; x++){
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5238 tprintf("CHROMA V ICPM LEVEL (%3d)\n", show_bits(&s->gb, 8));
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5239 h->mb[index + (x&3) + 16*(x>>2)]= get_bits(&s->gb, 8);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5240 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5241 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5242
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5243 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
5244 s->current_picture.qscale_table[mb_xy]= 0;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5245 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, 0);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5246 // All coeffs are present
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5247 memset(h->non_zero_count[mb_xy], 16, 16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5248
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5249 s->current_picture.mb_type[mb_xy]= mb_type;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5250 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5251 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5252
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5253 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5254 h->ref_count[0] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5255 h->ref_count[1] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5256 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5257
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
5258 fill_caches(h, mb_type, 0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5259
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5260 //mb_pred
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5261 if(IS_INTRA(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5262 // init_top_left_availability(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5263 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5264 int i;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5265 int di = 1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5266 if(dct8x8_allowed && get_bits1(&s->gb)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5267 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5268 di = 4;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5269 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5270
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5271 // fill_intra4x4_pred_table(h);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5272 for(i=0; i<16; i+=di){
3409
584ff6431043 simplify intra prediction mode decoding
michael
parents: 3379
diff changeset
5273 int mode= pred_intra_mode(h, i);
584ff6431043 simplify intra prediction mode decoding
michael
parents: 3379
diff changeset
5274
584ff6431043 simplify intra prediction mode decoding
michael
parents: 3379
diff changeset
5275 if(!get_bits1(&s->gb)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5276 const int rem_mode= get_bits(&s->gb, 3);
3409
584ff6431043 simplify intra prediction mode decoding
michael
parents: 3379
diff changeset
5277 mode = rem_mode + (rem_mode >= mode);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5278 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5279
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5280 if(di==4)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5281 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5282 else
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5283 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5284 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5285 write_back_intra_pred_mode(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5286 if( check_intra4x4_pred_mode(h) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5287 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5288 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5289 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5290 if(h->intra16x16_pred_mode < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5291 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5292 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5293 h->chroma_pred_mode= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5294
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5295 h->chroma_pred_mode= check_intra_pred_mode(h, h->chroma_pred_mode);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5296 if(h->chroma_pred_mode < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5297 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5298 }else if(partition_count==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5299 int i, j, sub_partition_count[4], list, ref[2][4];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5300
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5301 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5302 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5303 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5304 if(h->sub_mb_type[i] >=13){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5305 av_log(h->s.avctx, AV_LOG_ERROR, "B sub_mb_type %d out of range at %d %d\n", h->sub_mb_type[i], s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5306 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5307 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5308 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5309 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5310 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5311 if( IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1])
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
5312 || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5313 pred_direct_motion(h, &mb_type);
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
5314 h->ref_cache[0][scan8[4]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
5315 h->ref_cache[1][scan8[4]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
5316 h->ref_cache[0][scan8[12]] =
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
5317 h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE;
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
5318 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5319 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5320 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5321 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5322 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5323 if(h->sub_mb_type[i] >=4){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5324 av_log(h->s.avctx, AV_LOG_ERROR, "P sub_mb_type %d out of range at %d %d\n", h->sub_mb_type[i], s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5325 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5326 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5327 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5328 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5329 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5330 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5331
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5332 for(list=0; list<2; list++){
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5333 int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5334 if(ref_count == 0) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5335 for(i=0; i<4; i++){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5336 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5337 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5338 ref[list][i] = get_te0_golomb(&s->gb, ref_count); //FIXME init to 0 before and skip?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5339 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5340 //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5341 ref[list][i] = -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5342 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5343 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5344 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5345
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5346 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5347 dct8x8_allowed = get_dct8x8_allowed(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5348
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5349 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5350 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5351 if(ref_count == 0) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5352
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5353 for(i=0; i<4; i++){
3003
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
5354 if(IS_DIRECT(h->sub_mb_type[i])) {
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
5355 h->ref_cache[list][ scan8[4*i] ] = h->ref_cache[list][ scan8[4*i]+1 ];
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
5356 continue;
5411789c5f19 direct mvs in B_8x8 mbs were set too early.
lorenm
parents: 3002
diff changeset
5357 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5358 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5359 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5360
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5361 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5362 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5363 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5364 for(j=0; j<sub_partition_count[i]; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5365 int mx, my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5366 const int index= 4*i + block_width*j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5367 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5368 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5369 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5370 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
5371 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
5372
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5373 if(IS_SUB_8X8(sub_mb_type)){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5374 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5375 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5376 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]=
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5377 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5378 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5379 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5380 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5381 }else if(IS_SUB_4X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5382 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5383 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5384 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5385 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5386 mv_cache[ 0 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5387 mv_cache[ 0 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5388 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5389 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5390 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5391 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5392 p[0] = p[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5393 p[8] = p[9]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5394 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5395 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5396 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5397 }else if(IS_DIRECT(mb_type)){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5398 pred_direct_motion(h, &mb_type);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5399 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5400 }else{
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5401 int list, mx, my, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5402 //FIXME we should set ref_idx_l? to 0 if we use that later ...
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5403 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5404 for(list=0; list<2; list++){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
5405 if(h->ref_count[list]>0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5406 if(IS_DIR(mb_type, 0, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5407 const int val= get_te0_golomb(&s->gb, h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5408 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5409 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5410 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (LIST_NOT_USED&0xFF), 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5411 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5412 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5413 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5414 if(IS_DIR(mb_type, 0, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5415 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5416 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5417 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
5418 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
5419
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
5420 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5421 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5422 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5423 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5424 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5425 else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5426 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5427 if(h->ref_count[list]>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5428 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5429 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5430 const int val= get_te0_golomb(&s->gb, h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5431 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5432 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5433 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, (LIST_NOT_USED&0xFF), 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5434 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5435 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5436 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5437 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5438 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5439 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5440 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5441 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5442 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
5443 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
5444
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
5445 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5446 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5447 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5448 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5449 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5450 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5451 assert(IS_8X16(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5452 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5453 if(h->ref_count[list]>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5454 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5455 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5456 const int val= get_te0_golomb(&s->gb, h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5457 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
5458 }else
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5459 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, (LIST_NOT_USED&0xFF), 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5460 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5461 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5462 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5463 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5464 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5465 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5466 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5467 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5468 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
5469 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
5470
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
5471 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5472 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5473 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5474 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5475 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5476 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5477 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5478
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5479 if(IS_INTER(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5480 write_back_motion(h, mb_type);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5481
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5482 if(!IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5483 cbp= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5484 if(cbp > 47){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5485 av_log(h->s.avctx, AV_LOG_ERROR, "cbp too large (%d) at %d %d\n", cbp, s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5486 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5487 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5488
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5489 if(IS_INTRA4x4(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5490 cbp= golomb_to_intra4x4_cbp[cbp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5491 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5492 cbp= golomb_to_inter_cbp[cbp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5493 }
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
5494 h->cbp = cbp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5495
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5496 if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5497 if(get_bits1(&s->gb))
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5498 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5499 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5500 s->current_picture.mb_type[mb_xy]= mb_type;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5501
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5502 if(cbp || IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5503 int i8x8, i4x4, chroma_idx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5504 int chroma_qp, dquant;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5505 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr;
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
5506 const uint8_t *scan, *scan8x8, *dc_scan;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5507
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5508 // fill_non_zero_count_cache(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5509
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5510 if(IS_INTERLACED(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5511 scan8x8= s->qscale ? h->field_scan8x8_cavlc : h->field_scan8x8_cavlc_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5512 scan= s->qscale ? h->field_scan : h->field_scan_q0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5513 dc_scan= luma_dc_field_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5514 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5515 scan8x8= s->qscale ? h->zigzag_scan8x8_cavlc : h->zigzag_scan8x8_cavlc_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
5516 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5517 dc_scan= luma_dc_zigzag_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5518 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5519
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5520 dquant= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5521
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5522 if( dquant > 25 || dquant < -26 ){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5523 av_log(h->s.avctx, AV_LOG_ERROR, "dquant out of range (%d) at %d %d\n", dquant, s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5524 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5525 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5526
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5527 s->qscale += dquant;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5528 if(((unsigned)s->qscale) > 51){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5529 if(s->qscale<0) s->qscale+= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5530 else s->qscale-= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5531 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5532
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
5533 h->chroma_qp= chroma_qp= get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5534 if(IS_INTRA16x16(mb_type)){
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
5535 if( decode_residual(h, h->intra_gb_ptr, h->mb, LUMA_DC_BLOCK_INDEX, dc_scan, h->dequant4_coeff[0][s->qscale], 16) < 0){
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
5536 return -1; //FIXME continue if partitioned and other return -1 too
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5537 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5538
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5539 assert((cbp&15) == 0 || (cbp&15) == 15);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5540
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5541 if(cbp&15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5542 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5543 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5544 const int index= i4x4 + 4*i8x8;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
5545 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[0][s->qscale], 15) < 0 ){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5546 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5547 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5548 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5549 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5550 }else{
1636
d9d98cdcfcde intra16x16 fix
michael
parents: 1598
diff changeset
5551 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5552 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5553 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5554 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5555 if(cbp & (1<<i8x8)){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5556 if(IS_8x8DCT(mb_type)){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5557 DCTELEM *buf = &h->mb[64*i8x8];
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
5558 uint8_t *nnz;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5559 for(i4x4=0; i4x4<4; i4x4++){
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
5560 if( decode_residual(h, gb, buf, i4x4+4*i8x8, scan8x8+16*i4x4,
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
5561 h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 16) <0 )
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5562 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5563 }
2757
fa1c8955e291 remove mixed code/declarations
mru
parents: 2755
diff changeset
5564 nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
5565 nnz[0] += nnz[1] + nnz[8] + nnz[9];
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5566 }else{
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5567 for(i4x4=0; i4x4<4; i4x4++){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5568 const int index= i4x4 + 4*i8x8;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5569
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
5570 if( decode_residual(h, gb, h->mb + 16*index, index, scan, h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale], 16) <0 ){
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5571 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5572 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5573 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5574 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5575 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5576 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5577 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5578 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5579 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5580 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5581
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5582 if(cbp&0x30){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5583 for(chroma_idx=0; chroma_idx<2; chroma_idx++)
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
5584 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, NULL, 4) < 0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5585 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5586 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5587 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5588
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5589 if(cbp&0x20){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5590 for(chroma_idx=0; chroma_idx<2; chroma_idx++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5591 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5592 const int index= 16 + 4*chroma_idx + i4x4;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
5593 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, h->dequant4_coeff[chroma_idx+1+(IS_INTRA( mb_type ) ? 0:3)][chroma_qp], 15) < 0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5594 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5595 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5596 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5597 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5598 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5599 uint8_t * const nnz= &h->non_zero_count_cache[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5600 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5601 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5602 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5603 }else{
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5604 uint8_t * const nnz= &h->non_zero_count_cache[0];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5605 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1);
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5606 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5607 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5608 }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5609 s->current_picture.qscale_table[mb_xy]= s->qscale;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5610 write_back_non_zero_count(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5611
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5612 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5613 h->ref_count[0] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5614 h->ref_count[1] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5615 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5616
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5617 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5618 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5619
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5620 static int decode_cabac_field_decoding_flag(H264Context *h) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5621 MpegEncContext * const s = &h->s;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5622 const int mb_x = s->mb_x;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5623 const int mb_y = s->mb_y & ~1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5624 const int mba_xy = mb_x - 1 + mb_y *s->mb_stride;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5625 const int mbb_xy = mb_x + (mb_y-2)*s->mb_stride;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5626
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5627 unsigned int ctx = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5628
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5629 if( h->slice_table[mba_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) ) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5630 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5631 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5632 if( h->slice_table[mbb_xy] == h->slice_num && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) ) {
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5633 ctx += 1;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5634 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5635
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5636 return get_cabac_noinline( &h->cabac, &h->cabac_state[70 + ctx] );
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5637 }
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5638
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5639 static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_slice) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5640 uint8_t *state= &h->cabac_state[ctx_base];
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5641 int mb_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
5642
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5643 if(intra_slice){
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5644 MpegEncContext * const s = &h->s;
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5645 const int mba_xy = h->left_mb_xy[0];
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5646 const int mbb_xy = h->top_mb_xy;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5647 int ctx=0;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5648 if( h->slice_table[mba_xy] == h->slice_num && !IS_INTRA4x4( s->current_picture.mb_type[mba_xy] ) )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5649 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5650 if( h->slice_table[mbb_xy] == h->slice_num && !IS_INTRA4x4( s->current_picture.mb_type[mbb_xy] ) )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5651 ctx++;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5652 if( get_cabac_noinline( &h->cabac, &state[ctx] ) == 0 )
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5653 return 0; /* I4x4 */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5654 state += 2;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5655 }else{
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5656 if( get_cabac_noinline( &h->cabac, &state[0] ) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5657 return 0; /* I4x4 */
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5658 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5659
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5660 if( get_cabac_terminate( &h->cabac ) )
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5661 return 25; /* PCM */
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5662
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5663 mb_type = 1; /* I16x16 */
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5664 mb_type += 12 * get_cabac_noinline( &h->cabac, &state[1] ); /* cbp_luma != 0 */
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5665 if( get_cabac_noinline( &h->cabac, &state[2] ) ) /* cbp_chroma */
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5666 mb_type += 4 + 4 * get_cabac_noinline( &h->cabac, &state[2+intra_slice] );
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5667 mb_type += 2 * get_cabac_noinline( &h->cabac, &state[3+intra_slice] );
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5668 mb_type += 1 * get_cabac_noinline( &h->cabac, &state[3+2*intra_slice] );
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5669 return mb_type;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5670 }
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5671
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5672 static int decode_cabac_mb_type( H264Context *h ) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5673 MpegEncContext * const s = &h->s;
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5674
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5675 if( h->slice_type == I_TYPE ) {
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5676 return decode_cabac_intra_mb_type(h, 3, 1);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5677 } else if( h->slice_type == P_TYPE ) {
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5678 if( get_cabac_noinline( &h->cabac, &h->cabac_state[14] ) == 0 ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5679 /* P-type */
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5680 if( get_cabac_noinline( &h->cabac, &h->cabac_state[15] ) == 0 ) {
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5681 /* P_L0_D16x16, P_8x8 */
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5682 return 3 * get_cabac_noinline( &h->cabac, &h->cabac_state[16] );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5683 } else {
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5684 /* P_L0_D8x16, P_L0_D16x8 */
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5685 return 2 - get_cabac_noinline( &h->cabac, &h->cabac_state[17] );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5686 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5687 } else {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5688 return decode_cabac_intra_mb_type(h, 17, 0) + 5;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5689 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5690 } else if( h->slice_type == B_TYPE ) {
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5691 const int mba_xy = h->left_mb_xy[0];
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
5692 const int mbb_xy = h->top_mb_xy;
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5693 int ctx = 0;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5694 int bits;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5695
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5696 if( h->slice_table[mba_xy] == h->slice_num && !IS_DIRECT( s->current_picture.mb_type[mba_xy] ) )
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5697 ctx++;
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5698 if( h->slice_table[mbb_xy] == h->slice_num && !IS_DIRECT( s->current_picture.mb_type[mbb_xy] ) )
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5699 ctx++;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5700
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5701 if( !get_cabac_noinline( &h->cabac, &h->cabac_state[27+ctx] ) )
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5702 return 0; /* B_Direct_16x16 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5703
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5704 if( !get_cabac_noinline( &h->cabac, &h->cabac_state[27+3] ) ) {
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5705 return 1 + get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] ); /* B_L[01]_16x16 */
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5706 }
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5707
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5708 bits = get_cabac_noinline( &h->cabac, &h->cabac_state[27+4] ) << 3;
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5709 bits|= get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] ) << 2;
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5710 bits|= get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] ) << 1;
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5711 bits|= get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] );
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5712 if( bits < 8 )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5713 return bits + 3; /* B_Bi_16x16 through B_L1_L0_16x8 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5714 else if( bits == 13 ) {
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
5715 return decode_cabac_intra_mb_type(h, 32, 0) + 23;
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5716 } else if( bits == 14 )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5717 return 11; /* B_L1_L0_8x16 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5718 else if( bits == 15 )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5719 return 22; /* B_8x8 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5720
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5721 bits= ( bits<<1 ) | get_cabac_noinline( &h->cabac, &h->cabac_state[27+5] );
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5722 return bits - 4; /* B_L0_Bi_* through B_Bi_Bi_* */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5723 } else {
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5724 /* TODO SI/SP frames? */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5725 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5726 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5727 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5728
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5729 static int decode_cabac_mb_skip( H264Context *h, int mb_x, int mb_y ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5730 MpegEncContext * const s = &h->s;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5731 int mba_xy, mbb_xy;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5732 int ctx = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5733
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5734 if(FRAME_MBAFF){ //FIXME merge with the stuff in fill_caches?
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5735 int mb_xy = mb_x + (mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5736 mba_xy = mb_xy - 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5737 if( (mb_y&1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5738 && h->slice_table[mba_xy] == h->slice_num
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5739 && MB_FIELD == !!IS_INTERLACED( s->current_picture.mb_type[mba_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5740 mba_xy += s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5741 if( MB_FIELD ){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5742 mbb_xy = mb_xy - s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5743 if( !(mb_y&1)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5744 && h->slice_table[mbb_xy] == h->slice_num
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5745 && IS_INTERLACED( s->current_picture.mb_type[mbb_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5746 mbb_xy -= s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5747 }else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5748 mbb_xy = mb_x + (mb_y-1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5749 }else{
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5750 int mb_xy = mb_x + mb_y*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5751 mba_xy = mb_xy - 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5752 mbb_xy = mb_xy - s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5753 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5754
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5755 if( h->slice_table[mba_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mba_xy] ))
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5756 ctx++;
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5757 if( h->slice_table[mbb_xy] == h->slice_num && !IS_SKIP( s->current_picture.mb_type[mbb_xy] ))
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5758 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5759
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5760 if( h->slice_type == B_TYPE )
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5761 ctx += 13;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5762 return get_cabac_noinline( &h->cabac, &h->cabac_state[11+ctx] );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5763 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5764
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5765 static int decode_cabac_mb_intra4x4_pred_mode( H264Context *h, int pred_mode ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5766 int mode = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5767
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5768 if( get_cabac( &h->cabac, &h->cabac_state[68] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5769 return pred_mode;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5770
2928
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
5771 mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
5772 mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
5773 mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] );
16d67170715c tidier cabac_intra4x4_pred_mode
lorenm
parents: 2926
diff changeset
5774
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5775 if( mode >= pred_mode )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5776 return mode + 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5777 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5778 return mode;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5779 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5780
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5781 static int decode_cabac_mb_chroma_pre_mode( H264Context *h) {
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5782 const int mba_xy = h->left_mb_xy[0];
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5783 const int mbb_xy = h->top_mb_xy;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5784
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5785 int ctx = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5786
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
5787 /* No need to test for IS_INTRA4x4 and IS_INTRA16x16, as we set chroma_pred_mode_table to 0 */
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5788 if( h->slice_table[mba_xy] == h->slice_num && h->chroma_pred_mode_table[mba_xy] != 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5789 ctx++;
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
5790
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5791 if( h->slice_table[mbb_xy] == h->slice_num && h->chroma_pred_mode_table[mbb_xy] != 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5792 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5793
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5794 if( get_cabac_noinline( &h->cabac, &h->cabac_state[64+ctx] ) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5795 return 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5796
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5797 if( get_cabac_noinline( &h->cabac, &h->cabac_state[64+3] ) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5798 return 1;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5799 if( get_cabac_noinline( &h->cabac, &h->cabac_state[64+3] ) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5800 return 2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5801 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5802 return 3;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5803 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5804
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5805 static const uint8_t block_idx_x[16] = {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5806 0, 1, 0, 1, 2, 3, 2, 3, 0, 1, 0, 1, 2, 3, 2, 3
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5807 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5808 static const uint8_t block_idx_y[16] = {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5809 0, 0, 1, 1, 0, 0, 1, 1, 2, 2, 3, 3, 2, 2, 3, 3
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5810 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5811 static const uint8_t block_idx_xy[4][4] = {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5812 { 0, 2, 8, 10},
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5813 { 1, 3, 9, 11},
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5814 { 4, 6, 12, 14},
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5815 { 5, 7, 13, 15}
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5816 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5817
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5818 static int decode_cabac_mb_cbp_luma( H264Context *h) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5819 int cbp = 0;
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5820 int cbp_b = -1;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5821 int i8x8;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5822
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5823 if( h->slice_table[h->top_mb_xy] == h->slice_num ) {
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5824 cbp_b = h->top_cbp;
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5825 tprintf("cbp_b = top_cbp = %x\n", cbp_b);
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5826 }
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5827
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5828 for( i8x8 = 0; i8x8 < 4; i8x8++ ) {
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5829 int cbp_a = -1;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5830 int x, y;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5831 int ctx = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5832
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5833 x = block_idx_x[4*i8x8];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5834 y = block_idx_y[4*i8x8];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5835
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5836 if( x > 0 )
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5837 cbp_a = cbp;
3138
c12fc3d1c612 minor simplifications in cabac_mb_type
lorenm
parents: 3128
diff changeset
5838 else if( h->slice_table[h->left_mb_xy[0]] == h->slice_num ) {
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5839 cbp_a = h->left_cbp;
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5840 tprintf("cbp_a = left_cbp = %x\n", cbp_a);
2498
4d6d056a00c6 H.264 multiple slice support in CABAC patch by (Loic (lll+ffmpeg m4x org)
michael
parents: 2485
diff changeset
5841 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5842
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5843 if( y > 0 )
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5844 cbp_b = cbp;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5845
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
5846 /* No need to test for skip as we put 0 for skip block */
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
5847 /* No need to test for IPCM as we put 1 for IPCM block */
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5848 if( cbp_a >= 0 ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5849 int i8x8a = block_idx_xy[(x-1)&0x03][y]/4;
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5850 if( ((cbp_a >> i8x8a)&0x01) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5851 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5852 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5853
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5854 if( cbp_b >= 0 ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5855 int i8x8b = block_idx_xy[x][(y-1)&0x03]/4;
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
5856 if( ((cbp_b >> i8x8b)&0x01) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5857 ctx += 2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5858 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5859
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5860 if( get_cabac( &h->cabac, &h->cabac_state[73 + ctx] ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5861 cbp |= 1 << i8x8;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5862 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5863 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5864 return cbp;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5865 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5866 static int decode_cabac_mb_cbp_chroma( H264Context *h) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5867 int ctx;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5868 int cbp_a, cbp_b;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5869
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5870 cbp_a = (h->left_cbp>>4)&0x03;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
5871 cbp_b = (h-> top_cbp>>4)&0x03;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5872
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5873 ctx = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5874 if( cbp_a > 0 ) ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5875 if( cbp_b > 0 ) ctx += 2;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5876 if( get_cabac_noinline( &h->cabac, &h->cabac_state[77 + ctx] ) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5877 return 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5878
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5879 ctx = 4;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5880 if( cbp_a == 2 ) ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5881 if( cbp_b == 2 ) ctx += 2;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5882 return 1 + get_cabac_noinline( &h->cabac, &h->cabac_state[77 + ctx] );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5883 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5884 static int decode_cabac_mb_dqp( H264Context *h) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5885 MpegEncContext * const s = &h->s;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5886 int mbn_xy;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5887 int ctx = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5888 int val = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5889
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5890 if( s->mb_x > 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5891 mbn_xy = s->mb_x + s->mb_y*s->mb_stride - 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5892 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5893 mbn_xy = s->mb_width - 1 + (s->mb_y-1)*s->mb_stride;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5894
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
5895 if( h->last_qscale_diff != 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5896 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5897
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5898 while( get_cabac_noinline( &h->cabac, &h->cabac_state[60 + ctx] ) ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5899 if( ctx < 2 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5900 ctx = 2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5901 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5902 ctx = 3;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5903 val++;
3128
dd3f6be492bd don't arbitrarily limit delta_qp
lorenm
parents: 3126
diff changeset
5904 if(val > 102) //prevent infinite loop
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
5905 return INT_MIN;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5906 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5907
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5908 if( val&0x01 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5909 return (val + 1)/2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5910 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5911 return -(val + 1)/2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5912 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5913 static int decode_cabac_p_mb_sub_type( H264Context *h ) {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5914 if( get_cabac( &h->cabac, &h->cabac_state[21] ) )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5915 return 0; /* 8x8 */
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5916 if( !get_cabac( &h->cabac, &h->cabac_state[22] ) )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5917 return 1; /* 8x4 */
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5918 if( get_cabac( &h->cabac, &h->cabac_state[23] ) )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5919 return 2; /* 4x8 */
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5920 return 3; /* 4x4 */
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5921 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5922 static int decode_cabac_b_mb_sub_type( H264Context *h ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5923 int type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5924 if( !get_cabac( &h->cabac, &h->cabac_state[36] ) )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5925 return 0; /* B_Direct_8x8 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5926 if( !get_cabac( &h->cabac, &h->cabac_state[37] ) )
2311
cdbb2f30e08b small typo patch by (Gildas Bazin <gbazin at altern dot org>)
michael
parents: 2310
diff changeset
5927 return 1 + get_cabac( &h->cabac, &h->cabac_state[39] ); /* B_L0_8x8, B_L1_8x8 */
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5928 type = 3;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5929 if( get_cabac( &h->cabac, &h->cabac_state[38] ) ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5930 if( get_cabac( &h->cabac, &h->cabac_state[39] ) )
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5931 return 11 + get_cabac( &h->cabac, &h->cabac_state[39] ); /* B_L1_4x4, B_Bi_4x4 */
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5932 type += 4;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5933 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5934 type += 2*get_cabac( &h->cabac, &h->cabac_state[39] );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5935 type += get_cabac( &h->cabac, &h->cabac_state[39] );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5936 return type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
5937 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5938
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5939 static inline int decode_cabac_mb_transform_size( H264Context *h ) {
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
5940 return get_cabac_noinline( &h->cabac, &h->cabac_state[399 + h->neighbor_transform_size] );
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5941 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
5942
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5943 static int decode_cabac_mb_ref( H264Context *h, int list, int n ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5944 int refa = h->ref_cache[list][scan8[n] - 1];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5945 int refb = h->ref_cache[list][scan8[n] - 8];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5946 int ref = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5947 int ctx = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5948
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5949 if( h->slice_type == B_TYPE) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5950 if( refa > 0 && !h->direct_cache[scan8[n] - 1] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5951 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5952 if( refb > 0 && !h->direct_cache[scan8[n] - 8] )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5953 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5954 } else {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5955 if( refa > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5956 ctx++;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5957 if( refb > 0 )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5958 ctx += 2;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
5959 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5960
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5961 while( get_cabac( &h->cabac, &h->cabac_state[54+ctx] ) ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5962 ref++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5963 if( ctx < 4 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5964 ctx = 4;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5965 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5966 ctx = 5;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5967 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5968 return ref;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5969 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5970
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5971 static int decode_cabac_mb_mvd( H264Context *h, int list, int n, int l ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5972 int amvd = abs( h->mvd_cache[list][scan8[n] - 1][l] ) +
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5973 abs( h->mvd_cache[list][scan8[n] - 8][l] );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5974 int ctxbase = (l == 0) ? 40 : 47;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5975 int ctx, mvd;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5976
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5977 if( amvd < 3 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5978 ctx = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5979 else if( amvd > 32 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5980 ctx = 2;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5981 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5982 ctx = 1;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5983
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5984 if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx]))
2865f759882a optimzation
michael
parents: 2316
diff changeset
5985 return 0;
2865f759882a optimzation
michael
parents: 2316
diff changeset
5986
2865f759882a optimzation
michael
parents: 2316
diff changeset
5987 mvd= 1;
2865f759882a optimzation
michael
parents: 2316
diff changeset
5988 ctx= 3;
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5989 while( mvd < 9 && get_cabac( &h->cabac, &h->cabac_state[ctxbase+ctx] ) ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5990 mvd++;
2317
2865f759882a optimzation
michael
parents: 2316
diff changeset
5991 if( ctx < 6 )
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5992 ctx++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5993 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5994
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5995 if( mvd >= 9 ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5996 int k = 3;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5997 while( get_cabac_bypass( &h->cabac ) ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5998 mvd += 1 << k;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
5999 k++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6000 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6001 while( k-- ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6002 if( get_cabac_bypass( &h->cabac ) )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6003 mvd += 1 << k;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6004 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6005 }
4042
643cdc58bd69 slightly faster decode_cabac_mb_mvd()
michael
parents: 4041
diff changeset
6006 return get_cabac_bypass_sign( &h->cabac, -mvd );
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6007 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6008
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
6009 static int inline get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6010 int nza, nzb;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6011 int ctx = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6012
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6013 if( cat == 0 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6014 nza = h->left_cbp&0x100;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6015 nzb = h-> top_cbp&0x100;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6016 } else if( cat == 1 || cat == 2 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6017 nza = h->non_zero_count_cache[scan8[idx] - 1];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6018 nzb = h->non_zero_count_cache[scan8[idx] - 8];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6019 } else if( cat == 3 ) {
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6020 nza = (h->left_cbp>>(6+idx))&0x01;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6021 nzb = (h-> top_cbp>>(6+idx))&0x01;
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6022 } else {
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6023 assert(cat == 4);
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6024 nza = h->non_zero_count_cache[scan8[16+idx] - 1];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6025 nzb = h->non_zero_count_cache[scan8[16+idx] - 8];
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6026 }
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6027
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6028 if( nza > 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6029 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6030
2314
9db5a4aab7e4 cbp_table cleanup
michael
parents: 2313
diff changeset
6031 if( nzb > 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6032 ctx += 2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6033
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6034 return ctx + 4 * cat;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6035 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6036
3028
1fadd4c26175 tweak inlines.
lorenm
parents: 3005
diff changeset
6037 static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6038 const int mb_xy = h->s.mb_x + h->s.mb_y*h->s.mb_stride;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6039 static const int significant_coeff_flag_offset[2][6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6040 { 105+0, 105+15, 105+29, 105+44, 105+47, 402 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6041 { 277+0, 277+15, 277+29, 277+44, 277+47, 436 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6042 };
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6043 static const int last_coeff_flag_offset[2][6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6044 { 166+0, 166+15, 166+29, 166+44, 166+47, 417 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6045 { 338+0, 338+15, 338+29, 338+44, 338+47, 451 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6046 };
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6047 static const int coeff_abs_level_m1_offset[6] = {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6048 227+0, 227+10, 227+20, 227+30, 227+39, 426
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6049 };
4007
33d3d4ab9f59 int->uint8_t for 2 tables
michael
parents: 4001
diff changeset
6050 static const uint8_t significant_coeff_flag_offset_8x8[2][63] = {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6051 { 0, 1, 2, 3, 4, 5, 5, 4, 4, 3, 3, 4, 4, 4, 5, 5,
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6052 4, 4, 4, 4, 3, 3, 6, 7, 7, 7, 8, 9,10, 9, 8, 7,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6053 7, 6,11,12,13,11, 6, 7, 8, 9,14,10, 9, 8, 6,11,
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6054 12,13,11, 6, 9,14,10, 9,11,12,13,11,14,10,12 },
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6055 { 0, 1, 1, 2, 2, 3, 3, 4, 5, 6, 7, 7, 7, 8, 4, 5,
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6056 6, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,11,12,11,
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6057 9, 9,10,10, 8,11,12,11, 9, 9,10,10, 8,13,13, 9,
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6058 9,10,10, 8,13,13, 9, 9,10,10,14,14,14,14,14 }
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6059 };
4007
33d3d4ab9f59 int->uint8_t for 2 tables
michael
parents: 4001
diff changeset
6060 static const uint8_t last_coeff_flag_offset_8x8[63] = {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6061 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6062 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6063 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6064 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6065 };
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6066
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6067 int index[64];
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6068
4041
0113ceb0f953 1 variable less in decode_cabac_residual() no speed change (but less vars means less things gcc can load and store redundantly)
michael
parents: 4040
diff changeset
6069 int last;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6070 int coeff_count = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6071
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
6072 int abslevel1 = 1;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6073 int abslevelgt1 = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6074
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6075 uint8_t *significant_coeff_ctx_base;
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6076 uint8_t *last_coeff_ctx_base;
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6077 uint8_t *abs_level_m1_ctx_base;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6078
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6079 #ifndef ARCH_X86
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6080 #define CABAC_ON_STACK
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6081 #endif
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6082 #ifdef CABAC_ON_STACK
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6083 #define CC &cc
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6084 CABACContext cc;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6085 cc.range = h->cabac.range;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6086 cc.low = h->cabac.low;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6087 cc.bytestream= h->cabac.bytestream;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6088 #else
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6089 #define CC &h->cabac
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6090 #endif
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6091
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6092
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6093 /* cat: 0-> DC 16x16 n = 0
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6094 * 1-> AC 16x16 n = luma4x4idx
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6095 * 2-> Luma4x4 n = luma4x4idx
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6096 * 3-> DC Chroma n = iCbCr
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6097 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6098 * 5-> Luma8x8 n = 4 * luma8x8idx
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6099 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6100
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6101 /* read coded block flag */
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6102 if( cat != 5 ) {
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6103 if( get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n ) ] ) == 0 ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6104 if( cat == 1 || cat == 2 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6105 h->non_zero_count_cache[scan8[n]] = 0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6106 else if( cat == 4 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6107 h->non_zero_count_cache[scan8[16+n]] = 0;
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6108 #ifdef CABAC_ON_STACK
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6109 h->cabac.range = cc.range ;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6110 h->cabac.low = cc.low ;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6111 h->cabac.bytestream= cc.bytestream;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6112 #endif
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6113 return 0;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6114 }
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6115 }
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6116
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6117 significant_coeff_ctx_base = h->cabac_state
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6118 + significant_coeff_flag_offset[MB_FIELD][cat];
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6119 last_coeff_ctx_base = h->cabac_state
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6120 + last_coeff_flag_offset[MB_FIELD][cat];
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6121 abs_level_m1_ctx_base = h->cabac_state
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6122 + coeff_abs_level_m1_offset[cat];
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6123
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6124 if( cat == 5 ) {
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6125 #define DECODE_SIGNIFICANCE( coefs, sig_off, last_off ) \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6126 for(last= 0; last < coefs; last++) { \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6127 uint8_t *sig_ctx = significant_coeff_ctx_base + sig_off; \
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6128 if( get_cabac( CC, sig_ctx )) { \
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6129 uint8_t *last_ctx = last_coeff_ctx_base + last_off; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6130 index[coeff_count++] = last; \
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6131 if( get_cabac( CC, last_ctx ) ) { \
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6132 last= max_coeff; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6133 break; \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6134 } \
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6135 } \
4037
53be304c7f54 x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents: 4016
diff changeset
6136 }\
53be304c7f54 x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents: 4016
diff changeset
6137 if( last == max_coeff -1 ) {\
53be304c7f54 x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents: 4016
diff changeset
6138 index[coeff_count++] = last;\
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6139 }
4009
e5f7797e53c7 10l int vs uint8_t
michael
parents: 4008
diff changeset
6140 const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6141 DECODE_SIGNIFICANCE( 63, sig_off[last], last_coeff_flag_offset_8x8[last] );
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6142 } else {
4037
53be304c7f54 x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents: 4016
diff changeset
6143 #ifdef ARCH_X86
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6144 coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index);
4037
53be304c7f54 x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents: 4016
diff changeset
6145 #else
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6146 DECODE_SIGNIFICANCE( max_coeff - 1, last, last );
4037
53be304c7f54 x86 asm version of the decode significance loop (not 8x8) of decode_residual() 5% faster decode_residual() on P3
michael
parents: 4016
diff changeset
6147 #endif
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6148 }
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
6149 assert(coeff_count > 0);
fe25f849a169 optimization
michael
parents: 2315
diff changeset
6150
fe25f849a169 optimization
michael
parents: 2315
diff changeset
6151 if( cat == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6152 h->cbp_table[mb_xy] |= 0x100;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6153 else if( cat == 1 || cat == 2 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6154 h->non_zero_count_cache[scan8[n]] = coeff_count;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
6155 else if( cat == 3 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6156 h->cbp_table[mb_xy] |= 0x40 << n;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6157 else if( cat == 4 )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6158 h->non_zero_count_cache[scan8[16+n]] = coeff_count;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
6159 else {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6160 assert( cat == 5 );
3105
2d35fb3cb940 h264: special case dc-only idct. ~1% faster overall
lorenm
parents: 3101
diff changeset
6161 fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1);
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
6162 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6163
4041
0113ceb0f953 1 variable less in decode_cabac_residual() no speed change (but less vars means less things gcc can load and store redundantly)
michael
parents: 4040
diff changeset
6164 for( coeff_count--; coeff_count >= 0; coeff_count-- ) {
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6165 uint8_t *ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 )) + abs_level_m1_ctx_base;
4041
0113ceb0f953 1 variable less in decode_cabac_residual() no speed change (but less vars means less things gcc can load and store redundantly)
michael
parents: 4040
diff changeset
6166 int j= scantable[index[coeff_count]];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6167
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6168 if( get_cabac( CC, ctx ) == 0 ) {
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6169 if( !qmul ) {
4040
9eaea06c5ba6 optimize sign decoding code in decode_residual()
michael
parents: 4038
diff changeset
6170 block[j] = get_cabac_bypass_sign( CC, -1);
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
6171 }else{
4040
9eaea06c5ba6 optimize sign decoding code in decode_residual()
michael
parents: 4038
diff changeset
6172 block[j] = (get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6;;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
6173 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6174
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6175 abslevel1++;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6176 } else {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6177 int coeff_abs = 2;
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6178 ctx = 5 + FFMIN( 4, abslevelgt1 ) + abs_level_m1_ctx_base;
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6179 while( coeff_abs < 15 && get_cabac( CC, ctx ) ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6180 coeff_abs++;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6181 }
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6182
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6183 if( coeff_abs >= 15 ) {
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6184 int j = 0;
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6185 while( get_cabac_bypass( CC ) ) {
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6186 j++;
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6187 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6188
4016
29ea06410ce7 simplify escape decoding
michael
parents: 4009
diff changeset
6189 coeff_abs=1;
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6190 while( j-- ) {
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6191 coeff_abs += coeff_abs + get_cabac_bypass( CC );
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6192 }
4016
29ea06410ce7 simplify escape decoding
michael
parents: 4009
diff changeset
6193 coeff_abs+= 14;
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6194 }
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6195
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6196 if( !qmul ) {
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6197 if( get_cabac_bypass( CC ) ) block[j] = -coeff_abs;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
6198 else block[j] = coeff_abs;
fe25f849a169 optimization
michael
parents: 2315
diff changeset
6199 }else{
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6200 if( get_cabac_bypass( CC ) ) block[j] = (-coeff_abs * qmul[j] + 32) >> 6;
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6201 else block[j] = ( coeff_abs * qmul[j] + 32) >> 6;
2316
fe25f849a169 optimization
michael
parents: 2315
diff changeset
6202 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6203
2313
b5376aef1fe0 cleanup of decode_cabac_residual()
michael
parents: 2312
diff changeset
6204 abslevelgt1++;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6205 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6206 }
4038
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6207 #ifdef CABAC_ON_STACK
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6208 h->cabac.range = cc.range ;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6209 h->cabac.low = cc.low ;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6210 h->cabac.bytestream= cc.bytestream;
16697bdf4ac2 copy cabac context onto the stack for the c code in decode_cabac_residual() (15% faster on P3 but still slower then the current asm)
michael
parents: 4037
diff changeset
6211 #endif
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6212 return 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6213 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6214
3077
385e54795a9e Fix silly typos.
diego
parents: 3071
diff changeset
6215 static void inline compute_mb_neighbors(H264Context *h)
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6216 {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6217 MpegEncContext * const s = &h->s;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6218 const int mb_xy = s->mb_x + s->mb_y*s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6219 h->top_mb_xy = mb_xy - s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6220 h->left_mb_xy[0] = mb_xy - 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6221 if(FRAME_MBAFF){
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6222 const int pair_xy = s->mb_x + (s->mb_y & ~1)*s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6223 const int top_pair_xy = pair_xy - s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6224 const int top_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[top_pair_xy]);
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6225 const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6226 const int curr_mb_frame_flag = !MB_FIELD;
2597
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6227 const int bottom = (s->mb_y & 1);
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6228 if (bottom
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6229 ? !curr_mb_frame_flag // bottom macroblock
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6230 : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6231 ) {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6232 h->top_mb_xy -= s->mb_stride;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6233 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6234 if (left_mb_frame_flag != curr_mb_frame_flag) {
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6235 h->left_mb_xy[0] = pair_xy - 1;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6236 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6237 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6238 return;
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6239 }
b5b09255f7c3 CABAC support for MBAFF I frames patch by (Loc Le Loarer < lll+ffmpeg m4x org)
michael
parents: 2594
diff changeset
6240
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6241 /**
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6242 * decodes a macroblock
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6243 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6244 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6245 static int decode_mb_cabac(H264Context *h) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6246 MpegEncContext * const s = &h->s;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6247 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6248 int mb_type, partition_count, cbp = 0;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6249 int dct8x8_allowed= h->pps.transform_8x8_mode;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6250
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6251 s->dsp.clear_blocks(h->mb); //FIXME avoid if already clear (move after skip handlong?)
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6252
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
6253 tprintf("pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6254 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE ) {
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6255 int skip;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6256 /* a skipped mb needs the aff flag from the following mb */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6257 if( FRAME_MBAFF && s->mb_x==0 && (s->mb_y&1)==0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6258 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6259 if( FRAME_MBAFF && (s->mb_y&1)==1 && h->prev_mb_skipped )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6260 skip = h->next_mb_skipped;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6261 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6262 skip = decode_cabac_mb_skip( h, s->mb_x, s->mb_y );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6263 /* read skip flags */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6264 if( skip ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6265 if( FRAME_MBAFF && (s->mb_y&1)==0 ){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6266 s->current_picture.mb_type[mb_xy] = MB_TYPE_SKIP;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6267 h->next_mb_skipped = decode_cabac_mb_skip( h, s->mb_x, s->mb_y+1 );
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6268 if(h->next_mb_skipped)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6269 predict_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6270 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6271 h->mb_mbaff = h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6272 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6273
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6274 decode_mb_skip(h);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6275
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6276 h->cbp_table[mb_xy] = 0;
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
6277 h->chroma_pred_mode_table[mb_xy] = 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6278 h->last_qscale_diff = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6279
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6280 return 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6281
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6282 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6283 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6284 if(FRAME_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6285 if( (s->mb_y&1) == 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6286 h->mb_mbaff =
2594
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
6287 h->mb_field_decoding_flag = decode_cabac_field_decoding_flag(h);
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
6288 }else
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
6289 h->mb_field_decoding_flag= (s->picture_structure!=PICT_FRAME);
5357b214eda0 CABAC support for MBAFF I frames patch by (Loc Le Loarer | lll+ffmpeg m4x org)
michael
parents: 2583
diff changeset
6290
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
6291 h->prev_mb_skipped = 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6292
3077
385e54795a9e Fix silly typos.
diego
parents: 3071
diff changeset
6293 compute_mb_neighbors(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6294 if( ( mb_type = decode_cabac_mb_type( h ) ) < 0 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6295 av_log( h->s.avctx, AV_LOG_ERROR, "decode_cabac_mb_type failed\n" );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6296 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6297 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6298
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6299 if( h->slice_type == B_TYPE ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6300 if( mb_type < 23 ){
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6301 partition_count= b_mb_type_info[mb_type].partition_count;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6302 mb_type= b_mb_type_info[mb_type].type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6303 }else{
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6304 mb_type -= 23;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6305 goto decode_intra_mb;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6306 }
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6307 } else if( h->slice_type == P_TYPE ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6308 if( mb_type < 5) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6309 partition_count= p_mb_type_info[mb_type].partition_count;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6310 mb_type= p_mb_type_info[mb_type].type;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6311 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6312 mb_type -= 5;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6313 goto decode_intra_mb;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6314 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6315 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6316 assert(h->slice_type == I_TYPE);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6317 decode_intra_mb:
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6318 partition_count = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6319 cbp= i_mb_type_info[mb_type].cbp;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6320 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6321 mb_type= i_mb_type_info[mb_type].type;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6322 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6323 if(MB_FIELD)
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6324 mb_type |= MB_TYPE_INTERLACED;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6325
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6326 h->slice_table[ mb_xy ]= h->slice_num;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6327
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6328 if(IS_INTRA_PCM(mb_type)) {
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6329 const uint8_t *ptr;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6330 unsigned int x, y;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6331
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6332 // We assume these blocks are very rare so we dont optimize it.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6333 // FIXME The two following lines get the bitstream position in the cabac
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6334 // decode, I think it should be done by a function in cabac.h (or cabac.c).
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6335 ptr= h->cabac.bytestream;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6336 if (h->cabac.low&0x1) ptr-=CABAC_BITS/8;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6337
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6338 // The pixels are stored in the same order as levels in h->mb array.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6339 for(y=0; y<16; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6340 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6341 for(x=0; x<16; x++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6342 tprintf("LUMA ICPM LEVEL (%3d)\n", *ptr);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6343 h->mb[index + (x&3) + 16*((x>>2)&1) + 64*(x>>3)]= *ptr++;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6344 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6345 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6346 for(y=0; y<8; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6347 const int index= 256 + 4*(y&3) + 32*(y>>2);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6348 for(x=0; x<8; x++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6349 tprintf("CHROMA U ICPM LEVEL (%3d)\n", *ptr);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6350 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6351 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6352 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6353 for(y=0; y<8; y++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6354 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6355 for(x=0; x<8; x++){
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6356 tprintf("CHROMA V ICPM LEVEL (%3d)\n", *ptr);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6357 h->mb[index + (x&3) + 16*(x>>2)]= *ptr++;
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6358 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6359 }
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6360
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6361 ff_init_cabac_decoder(&h->cabac, ptr, h->cabac.bytestream_end - ptr);
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6362
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6363 // All blocks are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6364 h->cbp_table[mb_xy] = 0x1ef;
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
6365 h->chroma_pred_mode_table[mb_xy] = 0;
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6366 // In deblocking, the quantizer is 0
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6367 s->current_picture.qscale_table[mb_xy]= 0;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6368 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, 0);
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
6369 // All coeffs are present
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6370 memset(h->non_zero_count[mb_xy], 16, 16);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6371 s->current_picture.mb_type[mb_xy]= mb_type;
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
6372 return 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6373 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6374
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6375 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6376 h->ref_count[0] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6377 h->ref_count[1] <<= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6378 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6379
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
6380 fill_caches(h, mb_type, 0);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6381
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6382 if( IS_INTRA( mb_type ) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6383 int i;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6384 if( IS_INTRA4x4( mb_type ) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6385 if( dct8x8_allowed && decode_cabac_mb_transform_size( h ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6386 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6387 for( i = 0; i < 16; i+=4 ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6388 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6389 int mode = decode_cabac_mb_intra4x4_pred_mode( h, pred );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6390 fill_rectangle( &h->intra4x4_pred_mode_cache[ scan8[i] ], 2, 2, 8, mode, 1 );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6391 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6392 } else {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6393 for( i = 0; i < 16; i++ ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6394 int pred = pred_intra_mode( h, i );
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6395 h->intra4x4_pred_mode_cache[ scan8[i] ] = decode_cabac_mb_intra4x4_pred_mode( h, pred );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6396
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6397 //av_log( s->avctx, AV_LOG_ERROR, "i4x4 pred=%d mode=%d\n", pred, h->intra4x4_pred_mode_cache[ scan8[i] ] );
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6398 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6399 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6400 write_back_intra_pred_mode(h);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6401 if( check_intra4x4_pred_mode(h) < 0 ) return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6402 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6403 h->intra16x16_pred_mode= check_intra_pred_mode( h, h->intra16x16_pred_mode );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6404 if( h->intra16x16_pred_mode < 0 ) return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6405 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6406 h->chroma_pred_mode_table[mb_xy] =
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6407 h->chroma_pred_mode = decode_cabac_mb_chroma_pre_mode( h );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6408
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6409 h->chroma_pred_mode= check_intra_pred_mode( h, h->chroma_pred_mode );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6410 if( h->chroma_pred_mode < 0 ) return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6411 } else if( partition_count == 4 ) {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6412 int i, j, sub_partition_count[4], list, ref[2][4];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6413
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6414 if( h->slice_type == B_TYPE ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6415 for( i = 0; i < 4; i++ ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6416 h->sub_mb_type[i] = decode_cabac_b_mb_sub_type( h );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6417 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6418 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6419 }
3482
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
6420 if( IS_DIRECT(h->sub_mb_type[0] | h->sub_mb_type[1] |
c08b46172204 slightly faster h264 fill_caches()
lorenm
parents: 3455
diff changeset
6421 h->sub_mb_type[2] | h->sub_mb_type[3]) ) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6422 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6423 if( h->ref_count[0] > 1 || h->ref_count[1] > 1 ) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6424 for( i = 0; i < 4; i++ )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6425 if( IS_DIRECT(h->sub_mb_type[i]) )
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6426 fill_rectangle( &h->direct_cache[scan8[4*i]], 2, 2, 8, 1, 1 );
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6427 }
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6428 }
2310
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6429 } else {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6430 for( i = 0; i < 4; i++ ) {
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6431 h->sub_mb_type[i] = decode_cabac_p_mb_sub_type( h );
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6432 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6433 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
c5cd8a064c34 H.264 CABAC + B-frames patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2284
diff changeset
6434 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6435 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6436
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6437 for( list = 0; list < 2; list++ ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6438 if( h->ref_count[list] > 0 ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6439 for( i = 0; i < 4; i++ ) {
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6440 if(IS_DIRECT(h->sub_mb_type[i])) continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6441 if(IS_DIR(h->sub_mb_type[i], 0, list)){
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6442 if( h->ref_count[list] > 1 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6443 ref[list][i] = decode_cabac_mb_ref( h, list, 4*i );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6444 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6445 ref[list][i] = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6446 } else {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6447 ref[list][i] = -1;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6448 }
2110
michael
parents: 2099
diff changeset
6449 h->ref_cache[list][ scan8[4*i]+1 ]=
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6450 h->ref_cache[list][ scan8[4*i]+8 ]=h->ref_cache[list][ scan8[4*i]+9 ]= ref[list][i];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6451 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6452 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6453 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6454
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6455 if(dct8x8_allowed)
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6456 dct8x8_allowed = get_dct8x8_allowed(h);
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6457
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6458 for(list=0; list<2; list++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6459 for(i=0; i<4; i++){
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6460 if(IS_DIRECT(h->sub_mb_type[i])){
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6461 fill_rectangle(h->mvd_cache[list][scan8[4*i]], 2, 2, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6462 continue;
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6463 }
2110
michael
parents: 2099
diff changeset
6464 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ];
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6465
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6466 if(IS_DIR(h->sub_mb_type[i], 0, list) && !IS_DIRECT(h->sub_mb_type[i])){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6467 const int sub_mb_type= h->sub_mb_type[i];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6468 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6469 for(j=0; j<sub_partition_count[i]; j++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6470 int mpx, mpy;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6471 int mx, my;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6472 const int index= 4*i + block_width*j;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6473 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6474 int16_t (* mvd_cache)[2]= &h->mvd_cache[list][ scan8[index] ];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6475 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mpx, &mpy);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6476
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6477 mx = mpx + decode_cabac_mb_mvd( h, list, index, 0 );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6478 my = mpy + decode_cabac_mb_mvd( h, list, index, 1 );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6479 tprintf("final mv:%d %d\n", mx, my);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6480
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6481 if(IS_SUB_8X8(sub_mb_type)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6482 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6483 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6484 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6485 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6486
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6487 mvd_cache[ 0 ][0]= mvd_cache[ 1 ][0]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6488 mvd_cache[ 8 ][0]= mvd_cache[ 9 ][0]= mx - mpx;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6489 mvd_cache[ 0 ][1]= mvd_cache[ 1 ][1]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6490 mvd_cache[ 8 ][1]= mvd_cache[ 9 ][1]= my - mpy;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6491 }else if(IS_SUB_8X4(sub_mb_type)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6492 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6493 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6494
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6495 mvd_cache[ 0 ][0]= mvd_cache[ 1 ][0]= mx- mpx;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6496 mvd_cache[ 0 ][1]= mvd_cache[ 1 ][1]= my - mpy;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6497 }else if(IS_SUB_4X8(sub_mb_type)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6498 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6499 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6500
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6501 mvd_cache[ 0 ][0]= mvd_cache[ 8 ][0]= mx - mpx;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6502 mvd_cache[ 0 ][1]= mvd_cache[ 8 ][1]= my - mpy;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6503 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6504 assert(IS_SUB_4X4(sub_mb_type));
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6505 mv_cache[ 0 ][0]= mx;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6506 mv_cache[ 0 ][1]= my;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6507
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6508 mvd_cache[ 0 ][0]= mx - mpx;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6509 mvd_cache[ 0 ][1]= my - mpy;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6510 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6511 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6512 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6513 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6514 uint32_t *pd= (uint32_t *)&h->mvd_cache[list][ scan8[4*i] ][0];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6515 p[0] = p[1] = p[8] = p[9] = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6516 pd[0]= pd[1]= pd[8]= pd[9]= 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6517 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6518 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6519 }
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6520 } else if( IS_DIRECT(mb_type) ) {
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6521 pred_direct_motion(h, &mb_type);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6522 fill_rectangle(h->mvd_cache[0][scan8[0]], 4, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6523 fill_rectangle(h->mvd_cache[1][scan8[0]], 4, 4, 8, 0, 4);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6524 dct8x8_allowed &= h->sps.direct_8x8_inference_flag;
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6525 } else {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6526 int list, mx, my, i, mpx, mpy;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6527 if(IS_16X16(mb_type)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6528 for(list=0; list<2; list++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6529 if(IS_DIR(mb_type, 0, list)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6530 if(h->ref_count[list] > 0 ){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6531 const int ref = h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 0 ) : 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6532 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, ref, 1);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6533 }
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6534 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6535 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6536 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6537 for(list=0; list<2; list++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6538 if(IS_DIR(mb_type, 0, list)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6539 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mpx, &mpy);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6540
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6541 mx = mpx + decode_cabac_mb_mvd( h, list, 0, 0 );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6542 my = mpy + decode_cabac_mb_mvd( h, list, 0, 1 );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6543 tprintf("final mv:%d %d\n", mx, my);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6544
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6545 fill_rectangle(h->mvd_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx-mpx,my-mpy), 4);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6546 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6547 }else
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6548 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6549 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6550 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6551 else if(IS_16X8(mb_type)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6552 for(list=0; list<2; list++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6553 if(h->ref_count[list]>0){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6554 for(i=0; i<2; i++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6555 if(IS_DIR(mb_type, i, list)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6556 const int ref= h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 8*i ) : 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6557 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, ref, 1);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6558 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6559 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, (LIST_NOT_USED&0xFF), 1);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6560 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6561 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6562 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6563 for(list=0; list<2; list++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6564 for(i=0; i<2; i++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6565 if(IS_DIR(mb_type, i, list)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6566 pred_16x8_motion(h, 8*i, list, h->ref_cache[list][scan8[0] + 16*i], &mpx, &mpy);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6567 mx = mpx + decode_cabac_mb_mvd( h, list, 8*i, 0 );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6568 my = mpy + decode_cabac_mb_mvd( h, list, 8*i, 1 );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6569 tprintf("final mv:%d %d\n", mx, my);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6570
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6571 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx-mpx,my-mpy), 4);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6572 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6573 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6574 fill_rectangle(h->mvd_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6575 fill_rectangle(h-> mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, 0, 4);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6576 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6577 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6578 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6579 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6580 assert(IS_8X16(mb_type));
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6581 for(list=0; list<2; list++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6582 if(h->ref_count[list]>0){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6583 for(i=0; i<2; i++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6584 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6585 const int ref= h->ref_count[list] > 1 ? decode_cabac_mb_ref( h, list, 4*i ) : 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6586 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, ref, 1);
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6587 }else
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6588 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, (LIST_NOT_USED&0xFF), 1);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6589 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6590 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6591 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6592 for(list=0; list<2; list++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6593 for(i=0; i<2; i++){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6594 if(IS_DIR(mb_type, i, list)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6595 pred_8x16_motion(h, i*4, list, h->ref_cache[list][ scan8[0] + 2*i ], &mpx, &mpy);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6596 mx = mpx + decode_cabac_mb_mvd( h, list, 4*i, 0 );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6597 my = mpy + decode_cabac_mb_mvd( h, list, 4*i, 1 );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6598
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6599 tprintf("final mv:%d %d\n", mx, my);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6600 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx-mpx,my-mpy), 4);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6601 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4);
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
6602 }else{
2396
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6603 fill_rectangle(h->mvd_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4);
7e360068b653 implement B_DIRECT and B_SKIP macroblock types.
lorenm
parents: 2395
diff changeset
6604 fill_rectangle(h-> mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, 0, 4);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6605 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6606 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6607 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
6608 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6609 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6610
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
6611 if( IS_INTER( mb_type ) ) {
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
6612 h->chroma_pred_mode_table[mb_xy] = 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6613 write_back_motion( h, mb_type );
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
6614 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6615
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6616 if( !IS_INTRA16x16( mb_type ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6617 cbp = decode_cabac_mb_cbp_luma( h );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6618 cbp |= decode_cabac_mb_cbp_chroma( h ) << 4;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6619 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6620
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
6621 h->cbp_table[mb_xy] = h->cbp = cbp;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6622
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6623 if( dct8x8_allowed && (cbp&15) && !IS_INTRA( mb_type ) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6624 if( decode_cabac_mb_transform_size( h ) )
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6625 mb_type |= MB_TYPE_8x8DCT;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6626 }
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6627 s->current_picture.mb_type[mb_xy]= mb_type;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6628
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6629 if( cbp || IS_INTRA16x16( mb_type ) ) {
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
6630 const uint8_t *scan, *scan8x8, *dc_scan;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6631 int dqp;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6632
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6633 if(IS_INTERLACED(mb_type)){
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6634 scan8x8= s->qscale ? h->field_scan8x8 : h->field_scan8x8_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
6635 scan= s->qscale ? h->field_scan : h->field_scan_q0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6636 dc_scan= luma_dc_field_scan;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6637 }else{
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6638 scan8x8= s->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0;
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
6639 scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6640 dc_scan= luma_dc_zigzag_scan;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6641 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6642
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6643 h->last_qscale_diff = dqp = decode_cabac_mb_dqp( h );
2883
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
6644 if( dqp == INT_MIN ){
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
6645 av_log(h->s.avctx, AV_LOG_ERROR, "cabac decode of qscale diff failed at %d %d\n", s->mb_x, s->mb_y);
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
6646 return -1;
a95e55679dfa check return value of decode_cabac_mb_dqp, it is INT_MIN on error.
reimar
parents: 2867
diff changeset
6647 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6648 s->qscale += dqp;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6649 if(((unsigned)s->qscale) > 51){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6650 if(s->qscale<0) s->qscale+= 52;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6651 else s->qscale-= 52;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6652 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6653 h->chroma_qp = get_chroma_qp(h->pps.chroma_qp_index_offset, s->qscale);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6654
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6655 if( IS_INTRA16x16( mb_type ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6656 int i;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6657 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" );
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6658 if( decode_cabac_residual( h, h->mb, 0, 0, dc_scan, NULL, 16) < 0)
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6659 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6660 if( cbp&15 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6661 for( i = 0; i < 16; i++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6662 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i );
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6663 if( decode_cabac_residual(h, h->mb + 16*i, 1, i, scan + 1, h->dequant4_coeff[0][s->qscale], 15) < 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6664 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6665 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6666 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6667 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6668 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6669 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6670 int i8x8, i4x4;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6671 for( i8x8 = 0; i8x8 < 4; i8x8++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6672 if( cbp & (1<<i8x8) ) {
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6673 if( IS_8x8DCT(mb_type) ) {
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6674 if( decode_cabac_residual(h, h->mb + 64*i8x8, 5, 4*i8x8,
3174
b65cbae9d940 h264_idct8_add_mmx
lorenm
parents: 3161
diff changeset
6675 scan8x8, h->dequant8_coeff[IS_INTRA( mb_type ) ? 0:1][s->qscale], 64) < 0 )
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6676 return -1;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
6677 } else
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6678 for( i4x4 = 0; i4x4 < 4; i4x4++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6679 const int index = 4*i8x8 + i4x4;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6680 //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index );
3972
f5f1c9af095d move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...
michael
parents: 3955
diff changeset
6681 //START_TIMER
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6682 if( decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, h->dequant4_coeff[IS_INTRA( mb_type ) ? 0:3][s->qscale], 16) < 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6683 return -1;
3972
f5f1c9af095d move outcommented START/STOP_TIMER to a hopefully better place for benchmarking ...
michael
parents: 3955
diff changeset
6684 //STOP_TIMER("decode_residual")
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6685 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6686 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6687 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6688 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6689 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6690 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6691 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6692
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6693 if( cbp&0x30 ){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6694 int c;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6695 for( c = 0; c < 2; c++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6696 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c );
2898
95f469274a1d 6% faster decode_cabac_residual
lorenm
parents: 2897
diff changeset
6697 if( decode_cabac_residual(h, h->mb + 256 + 16*4*c, 3, c, chroma_dc_scan, NULL, 4) < 0)
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6698 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6699 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6700 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6701
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6702 if( cbp&0x20 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6703 int c, i;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6704 for( c = 0; c < 2; c++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6705 for( i = 0; i < 4; i++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6706 const int index = 16 + 4 * c + i;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6707 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 );
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
6708 if( decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, h->dequant4_coeff[c+1+(IS_INTRA( mb_type ) ? 0:3)][h->chroma_qp], 15) < 0)
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6709 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6710 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6711 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6712 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6713 uint8_t * const nnz= &h->non_zero_count_cache[0];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6714 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6715 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6716 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6717 } else {
2315
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
6718 uint8_t * const nnz= &h->non_zero_count_cache[0];
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
6719 fill_rectangle(&nnz[scan8[0]], 4, 4, 8, 0, 1);
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
6720 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
29b67549d0cc fix CABAC+LOOP missmatch
michael
parents: 2314
diff changeset
6721 nnz[ scan8[20]+0 ] = nnz[ scan8[20]+1 ] =nnz[ scan8[20]+8 ] =nnz[ scan8[20]+9 ] = 0;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6722 h->last_qscale_diff = 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6723 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6724
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6725 s->current_picture.qscale_table[mb_xy]= s->qscale;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6726 write_back_non_zero_count(h);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6727
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6728 if(MB_MBAFF){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6729 h->ref_count[0] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6730 h->ref_count[1] >>= 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6731 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6732
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6733 return 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6734 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6735
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
6736
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6737 static void filter_mb_edgev( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6738 int i, d;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6739 const int index_a = clip( qp + h->slice_alpha_c0_offset, 0, 51 );
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6740 const int alpha = alpha_table[index_a];
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6741 const int beta = beta_table[clip( qp + h->slice_beta_offset, 0, 51 )];
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6742
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6743 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6744 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6745 for(i=0; i<4; i++)
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6746 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] : -1;
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6747 h->s.dsp.h264_h_loop_filter_luma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6748 } else {
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6749 /* 16px edge length, because bS=4 is triggered by being at
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6750 * the edge of an intra MB, so all 4 bS are the same */
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6751 for( d = 0; d < 16; d++ ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6752 const int p0 = pix[-1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6753 const int p1 = pix[-2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6754 const int p2 = pix[-3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6755
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6756 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6757 const int q1 = pix[1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6758 const int q2 = pix[2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6759
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6760 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6761 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6762 FFABS( q1 - q0 ) < beta ) {
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6763
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6764 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6765 if( FFABS( p2 - p0 ) < beta)
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6766 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6767 const int p3 = pix[-4];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6768 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6769 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6770 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6771 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6772 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6773 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6774 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6775 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6776 if( FFABS( q2 - q0 ) < beta)
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6777 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6778 const int q3 = pix[3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6779 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6780 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6781 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6782 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6783 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6784 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6785 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6786 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6787 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6788 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6789 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6790 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6791 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6792 tprintf("filter_mb_edgev i:%d d:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, p2, p1, p0, q0, q1, q2, pix[-2], pix[-1], pix[0], pix[1]);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6793 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6794 pix += stride;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6795 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6796 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6797 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6798 static void filter_mb_edgecv( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
6799 int i;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6800 const int index_a = clip( qp + h->slice_alpha_c0_offset, 0, 51 );
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6801 const int alpha = alpha_table[index_a];
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6802 const int beta = beta_table[clip( qp + h->slice_beta_offset, 0, 51 )];
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6803
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6804 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6805 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6806 for(i=0; i<4; i++)
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6807 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] + 1 : 0;
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6808 h->s.dsp.h264_h_loop_filter_chroma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6809 } else {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6810 h->s.dsp.h264_h_loop_filter_chroma_intra(pix, stride, alpha, beta);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6811 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6812 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6813
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6814 static void filter_mb_mbaff_edgev( H264Context *h, uint8_t *pix, int stride, int16_t bS[8], int qp[2] ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6815 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6816 for( i = 0; i < 16; i++, pix += stride) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6817 int index_a;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6818 int alpha;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6819 int beta;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
6820
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6821 int qp_index;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6822 int bS_index = (i >> 1);
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6823 if (!MB_FIELD) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6824 bS_index &= ~1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6825 bS_index |= (i & 1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6826 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6827
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6828 if( bS[bS_index] == 0 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6829 continue;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6830 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6831
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6832 qp_index = MB_FIELD ? (i >> 3) : (i & 1);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6833 index_a = clip( qp[qp_index] + h->slice_alpha_c0_offset, 0, 51 );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6834 alpha = alpha_table[index_a];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6835 beta = beta_table[clip( qp[qp_index] + h->slice_beta_offset, 0, 51 )];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6836
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6837 if( bS[bS_index] < 4 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6838 const int tc0 = tc0_table[index_a][bS[bS_index] - 1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6839 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6840 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6841 const int p2 = pix[-3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6842 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6843 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6844 const int q2 = pix[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6845
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6846 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6847 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6848 FFABS( q1 - q0 ) < beta ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6849 int tc = tc0;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6850 int i_delta;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6851
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6852 if( FFABS( p2 - p0 ) < beta ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6853 pix[-2] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6854 tc++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6855 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6856 if( FFABS( q2 - q0 ) < beta ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6857 pix[1] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6858 tc++;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6859 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6860
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6861 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6862 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6863 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6864 tprintf("filter_mb_mbaff_edgev i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6865 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6866 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6867 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6868 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6869 const int p2 = pix[-3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6870
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6871 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6872 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6873 const int q2 = pix[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6874
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6875 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6876 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6877 FFABS( q1 - q0 ) < beta ) {
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6878
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6879 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6880 if( FFABS( p2 - p0 ) < beta)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6881 {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6882 const int p3 = pix[-4];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6883 /* p0', p1', p2' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6884 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6885 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6886 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6887 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6888 /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6889 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6890 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6891 if( FFABS( q2 - q0 ) < beta)
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6892 {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6893 const int q3 = pix[3];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6894 /* q0', q1', q2' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6895 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6896 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6897 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6898 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6899 /* q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6900 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6901 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6902 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6903 /* p0', q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6904 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6905 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6906 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6907 tprintf("filter_mb_mbaff_edgev i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, p2, p1, p0, q0, q1, q2, pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6908 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6909 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6910 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6911 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6912 static void filter_mb_mbaff_edgecv( H264Context *h, uint8_t *pix, int stride, int16_t bS[8], int qp[2] ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6913 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6914 for( i = 0; i < 8; i++, pix += stride) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6915 int index_a;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6916 int alpha;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6917 int beta;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6918
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6919 int qp_index;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6920 int bS_index = i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6921
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6922 if( bS[bS_index] == 0 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6923 continue;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6924 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6925
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6926 qp_index = MB_FIELD ? (i >> 2) : (i & 1);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6927 index_a = clip( qp[qp_index] + h->slice_alpha_c0_offset, 0, 51 );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6928 alpha = alpha_table[index_a];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6929 beta = beta_table[clip( qp[qp_index] + h->slice_beta_offset, 0, 51 )];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
6930
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6931 if( bS[bS_index] < 4 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6932 const int tc = tc0_table[index_a][bS[bS_index] - 1] + 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6933 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6934 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6935 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6936 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6937
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6938 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6939 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6940 FFABS( q1 - q0 ) < beta ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6941 const int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6942
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6943 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6944 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6945 tprintf("filter_mb_mbaff_edgecv i:%d, qp:%d, indexA:%d, alpha:%d, beta:%d, tc:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, qp[qp_index], index_a, alpha, beta, tc, bS[bS_index], pix[-3], p1, p0, q0, q1, pix[2], p1, pix[-1], pix[0], q1);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6946 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6947 }else{
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6948 const int p0 = pix[-1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6949 const int p1 = pix[-2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6950 const int q0 = pix[0];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6951 const int q1 = pix[1];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6952
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6953 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6954 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6955 FFABS( q1 - q0 ) < beta ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6956
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6957 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6958 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6959 tprintf("filter_mb_mbaff_edgecv i:%d\n# bS:4 -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x, %02x, %02x]\n", i, pix[-3], p1, p0, q0, q1, pix[2], pix[-3], pix[-2], pix[-1], pix[0], pix[1], pix[2]);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6960 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6961 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6962 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6963 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
6964
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
6965 static void filter_mb_edgeh( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6966 int i, d;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6967 const int index_a = clip( qp + h->slice_alpha_c0_offset, 0, 51 );
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6968 const int alpha = alpha_table[index_a];
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6969 const int beta = beta_table[clip( qp + h->slice_beta_offset, 0, 51 )];
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6970 const int pix_next = stride;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
6971
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6972 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
6973 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6974 for(i=0; i<4; i++)
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6975 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] : -1;
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6976 h->s.dsp.h264_v_loop_filter_luma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6977 } else {
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6978 /* 16px edge length, see filter_mb_edgev */
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
6979 for( d = 0; d < 16; d++ ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6980 const int p0 = pix[-1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6981 const int p1 = pix[-2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6982 const int p2 = pix[-3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6983 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6984 const int q1 = pix[1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6985 const int q2 = pix[2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6986
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6987 if( FFABS( p0 - q0 ) < alpha &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6988 FFABS( p1 - p0 ) < beta &&
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6989 FFABS( q1 - q0 ) < beta ) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6990
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6991 const int p3 = pix[-4*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6992 const int q3 = pix[ 3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6993
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6994 if(FFABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
6995 if( FFABS( p2 - p0 ) < beta) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6996 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6997 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6998 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
6999 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7000 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7001 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7002 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7003 }
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
7004 if( FFABS( q2 - q0 ) < beta) {
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7005 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7006 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7007 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7008 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7009 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7010 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7011 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7012 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7013 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7014 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7015 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7016 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7017 }
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7018 tprintf("filter_mb_edgeh i:%d d:%d, qp:%d, indexA:%d, alpha:%d, beta:%d\n# bS:%d -> [%02x, %02x, %02x, %02x, %02x, %02x] =>[%02x, %02x, %02x, %02x]\n", i, d, qp, index_a, alpha, beta, bS[i], p2, p1, p0, q0, q1, q2, pix[-2*pix_next], pix[-pix_next], pix[0], pix[pix_next]);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7019 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7020 pix++;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7021 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7022 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7023 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7024
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7025 static void filter_mb_edgech( H264Context *h, uint8_t *pix, int stride, int16_t bS[4], int qp ) {
2834
fd5d7c732c6b kill a bunch of compiler warnings
mru
parents: 2815
diff changeset
7026 int i;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7027 const int index_a = clip( qp + h->slice_alpha_c0_offset, 0, 51 );
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7028 const int alpha = alpha_table[index_a];
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7029 const int beta = beta_table[clip( qp + h->slice_beta_offset, 0, 51 )];
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7030
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
7031 if( bS[0] < 4 ) {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
7032 int8_t tc[4];
2633
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
7033 for(i=0; i<4; i++)
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
7034 tc[i] = bS[i] ? tc0_table[index_a][bS[i] - 1] + 1 : 0;
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
7035 h->s.dsp.h264_v_loop_filter_chroma(pix, stride, alpha, beta, tc);
72e6ffa1f3a5 MMX for H.264 deblocking filter
lorenm
parents: 2629
diff changeset
7036 } else {
2707
360024d31dab H.264 deblocking optimizations (mmx for chroma_bS4 case, convert existing cases to 8-bit math)
lorenm
parents: 2683
diff changeset
7037 h->s.dsp.h264_v_loop_filter_chroma_intra(pix, stride, alpha, beta);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7038 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7039 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7040
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7041 static void 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) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7042 MpegEncContext * const s = &h->s;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7043 int mb_xy, mb_type;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7044 int qp, qp0, qp1, qpc, qpc0, qpc1, qp_thresh;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7045
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7046 if(mb_x==0 || mb_y==0 || !s->dsp.h264_loop_filter_strength) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7047 filter_mb(h, mb_x, mb_y, img_y, img_cb, img_cr, linesize, uvlinesize);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7048 return;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7049 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7050 assert(!FRAME_MBAFF);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7051
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7052 mb_xy = mb_x + mb_y*s->mb_stride;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7053 mb_type = s->current_picture.mb_type[mb_xy];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7054 qp = s->current_picture.qscale_table[mb_xy];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7055 qp0 = s->current_picture.qscale_table[mb_xy-1];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7056 qp1 = s->current_picture.qscale_table[h->top_mb_xy];
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7057 qpc = get_chroma_qp( h->pps.chroma_qp_index_offset, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7058 qpc0 = get_chroma_qp( h->pps.chroma_qp_index_offset, qp0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7059 qpc1 = get_chroma_qp( h->pps.chroma_qp_index_offset, qp1 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7060 qp0 = (qp + qp0 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7061 qp1 = (qp + qp1 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7062 qpc0 = (qpc + qpc0 + 1) >> 1;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7063 qpc1 = (qpc + qpc1 + 1) >> 1;
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7064 qp_thresh = 15 - h->slice_alpha_c0_offset;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7065 if(qp <= qp_thresh && qp0 <= qp_thresh && qp1 <= qp_thresh &&
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7066 qpc <= qp_thresh && qpc0 <= qp_thresh && qpc1 <= qp_thresh)
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7067 return;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7068
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7069 if( IS_INTRA(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7070 int16_t bS4[4] = {4,4,4,4};
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7071 int16_t bS3[4] = {3,3,3,3};
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7072 if( IS_8x8DCT(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7073 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7074 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7075 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bS4, qp1 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7076 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7077 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7078 filter_mb_edgev( h, &img_y[4*0], linesize, bS4, qp0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7079 filter_mb_edgev( h, &img_y[4*1], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7080 filter_mb_edgev( h, &img_y[4*2], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7081 filter_mb_edgev( h, &img_y[4*3], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7082 filter_mb_edgeh( h, &img_y[4*0*linesize], linesize, bS4, qp1 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7083 filter_mb_edgeh( h, &img_y[4*1*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7084 filter_mb_edgeh( h, &img_y[4*2*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7085 filter_mb_edgeh( h, &img_y[4*3*linesize], linesize, bS3, qp );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7086 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7087 filter_mb_edgecv( h, &img_cb[2*0], uvlinesize, bS4, qpc0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7088 filter_mb_edgecv( h, &img_cb[2*2], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7089 filter_mb_edgecv( h, &img_cr[2*0], uvlinesize, bS4, qpc0 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7090 filter_mb_edgecv( h, &img_cr[2*2], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7091 filter_mb_edgech( h, &img_cb[2*0*uvlinesize], uvlinesize, bS4, qpc1 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7092 filter_mb_edgech( h, &img_cb[2*2*uvlinesize], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7093 filter_mb_edgech( h, &img_cr[2*0*uvlinesize], uvlinesize, bS4, qpc1 );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7094 filter_mb_edgech( h, &img_cr[2*2*uvlinesize], uvlinesize, bS3, qpc );
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7095 return;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7096 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7097 DECLARE_ALIGNED_8(int16_t, bS[2][4][4]);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7098 uint64_t (*bSv)[4] = (uint64_t(*)[4])bS;
3651
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7099 int edges;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7100 if( IS_8x8DCT(mb_type) && (h->cbp&7) == 7 ) {
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7101 edges = 4;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7102 bSv[0][0] = bSv[0][2] = bSv[1][0] = bSv[1][2] = 0x0002000200020002ULL;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7103 } else {
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7104 int mask_edge1 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16)) ? 3 :
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7105 (mb_type & MB_TYPE_16x8) ? 1 : 0;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7106 int mask_edge0 = (mb_type & (MB_TYPE_16x16 | MB_TYPE_8x16))
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7107 && (s->current_picture.mb_type[mb_xy-1] & (MB_TYPE_16x16 | MB_TYPE_8x16))
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7108 ? 3 : 0;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7109 int step = IS_8x8DCT(mb_type) ? 2 : 1;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7110 edges = (mb_type & MB_TYPE_16x16) && !(h->cbp & 15) ? 1 : 4;
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7111 s->dsp.h264_loop_filter_strength( bS, h->non_zero_count_cache, h->ref_cache, h->mv_cache,
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7112 (h->slice_type == B_TYPE), edges, step, mask_edge0, mask_edge1 );
2265410d1d74 slightly faster deblock
lorenm
parents: 3645
diff changeset
7113 }
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7114 if( IS_INTRA(s->current_picture.mb_type[mb_xy-1]) )
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7115 bSv[0][0] = 0x0004000400040004ULL;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7116 if( IS_INTRA(s->current_picture.mb_type[h->top_mb_xy]) )
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7117 bSv[1][0] = 0x0004000400040004ULL;
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7118
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7119 #define FILTER(hv,dir,edge)\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7120 if(bSv[dir][edge]) {\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7121 filter_mb_edge##hv( h, &img_y[4*edge*(dir?linesize:1)], linesize, bS[dir][edge], edge ? qp : qp##dir );\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7122 if(!(edge&1)) {\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7123 filter_mb_edgec##hv( h, &img_cb[2*edge*(dir?uvlinesize:1)], uvlinesize, bS[dir][edge], edge ? qpc : qpc##dir );\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7124 filter_mb_edgec##hv( h, &img_cr[2*edge*(dir?uvlinesize:1)], uvlinesize, bS[dir][edge], edge ? qpc : qpc##dir );\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7125 }\
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7126 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7127 if( edges == 1 ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7128 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7129 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7130 } else if( IS_8x8DCT(mb_type) ) {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7131 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7132 FILTER(v,0,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7133 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7134 FILTER(h,1,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7135 } else {
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7136 FILTER(v,0,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7137 FILTER(v,0,1);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7138 FILTER(v,0,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7139 FILTER(v,0,3);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7140 FILTER(h,1,0);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7141 FILTER(h,1,1);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7142 FILTER(h,1,2);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7143 FILTER(h,1,3);
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7144 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7145 #undef FILTER
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7146 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7147 }
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7148
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7149 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7150 MpegEncContext * const s = &h->s;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7151 const int mb_xy= mb_x + mb_y*s->mb_stride;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7152 const int mb_type = s->current_picture.mb_type[mb_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7153 const int mvy_limit = IS_INTERLACED(mb_type) ? 2 : 4;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7154 int first_vertical_edge_done = 0;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7155 int dir;
2629
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
7156 /* FIXME: A given frame may occupy more than one position in
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
7157 * the reference list. So ref2frm should be populated with
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
7158 * frame numbers, not indices. */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7159 static const int ref2frm[34] = {-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7160 16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31};
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7161
3101
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
7162 //for sufficiently low qp, filtering wouldn't do anything
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
7163 //this is a conservative estimate: could also check beta_offset and more accurate chroma_qp
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7164 if(!FRAME_MBAFF){
3101
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
7165 int qp_thresh = 15 - h->slice_alpha_c0_offset - FFMAX(0, h->pps.chroma_qp_index_offset);
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
7166 int qp = s->current_picture.qscale_table[mb_xy];
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
7167 if(qp <= qp_thresh
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
7168 && (mb_x == 0 || ((qp + s->current_picture.qscale_table[mb_xy-1] + 1)>>1) <= qp_thresh)
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
7169 && (mb_y == 0 || ((qp + s->current_picture.qscale_table[h->top_mb_xy] + 1)>>1) <= qp_thresh)){
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
7170 return;
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
7171 }
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
7172 }
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
7173
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7174 if (FRAME_MBAFF
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7175 // left mb is in picture
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7176 && h->slice_table[mb_xy-1] != 255
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7177 // and current and left pair do not have the same interlaced type
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7178 && (IS_INTERLACED(mb_type) != IS_INTERLACED(s->current_picture.mb_type[mb_xy-1]))
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7179 // and left mb is in the same slice if deblocking_filter == 2
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7180 && (h->deblocking_filter!=2 || h->slice_table[mb_xy-1] == h->slice_table[mb_xy])) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7181 /* First vertical edge is different in MBAFF frames
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7182 * There are 8 different bS to compute and 2 different Qp
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7183 */
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7184 const int pair_xy = mb_x + (mb_y&~1)*s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7185 const int left_mb_xy[2] = { pair_xy-1, pair_xy-1+s->mb_stride };
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7186 int16_t bS[8];
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7187 int qp[2];
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7188 int chroma_qp[2];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7189 int mb_qp, mbn0_qp, mbn1_qp;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7190 int i;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7191 first_vertical_edge_done = 1;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7192
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7193 if( IS_INTRA(mb_type) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7194 bS[0] = bS[1] = bS[2] = bS[3] = bS[4] = bS[5] = bS[6] = bS[7] = 4;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7195 else {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7196 for( i = 0; i < 8; i++ ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7197 int mbn_xy = MB_FIELD ? left_mb_xy[i>>2] : left_mb_xy[i&1];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7198
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7199 if( IS_INTRA( s->current_picture.mb_type[mbn_xy] ) )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7200 bS[i] = 4;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7201 else if( h->non_zero_count_cache[12+8*(i>>1)] != 0 ||
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7202 /* FIXME: with 8x8dct + cavlc, should check cbp instead of nnz */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7203 h->non_zero_count[mbn_xy][MB_FIELD ? i&3 : (i>>2)+(mb_y&1)*2] )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7204 bS[i] = 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7205 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7206 bS[i] = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7207 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7208 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7209
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7210 mb_qp = s->current_picture.qscale_table[mb_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7211 mbn0_qp = s->current_picture.qscale_table[left_mb_xy[0]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7212 mbn1_qp = s->current_picture.qscale_table[left_mb_xy[1]];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7213 qp[0] = ( mb_qp + mbn0_qp + 1 ) >> 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7214 chroma_qp[0] = ( get_chroma_qp( h->pps.chroma_qp_index_offset, mb_qp ) +
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7215 get_chroma_qp( h->pps.chroma_qp_index_offset, mbn0_qp ) + 1 ) >> 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7216 qp[1] = ( mb_qp + mbn1_qp + 1 ) >> 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7217 chroma_qp[1] = ( get_chroma_qp( h->pps.chroma_qp_index_offset, mb_qp ) +
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7218 get_chroma_qp( h->pps.chroma_qp_index_offset, mbn1_qp ) + 1 ) >> 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7219
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7220 /* Filter edge */
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7221 tprintf("filter mb:%d/%d MBAFF, QPy:%d/%d, QPc:%d/%d ls:%d uvls:%d", mb_x, mb_y, qp[0], qp[1], chroma_qp[0], chroma_qp[1], linesize, uvlinesize);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7222 { int i; for (i = 0; i < 8; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7223 filter_mb_mbaff_edgev ( h, &img_y [0], linesize, bS, qp );
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7224 filter_mb_mbaff_edgecv( h, &img_cb[0], uvlinesize, bS, chroma_qp );
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7225 filter_mb_mbaff_edgecv( h, &img_cr[0], uvlinesize, bS, chroma_qp );
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7226 }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7227 /* dir : 0 -> vertical edge, 1 -> horizontal edge */
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7228 for( dir = 0; dir < 2; dir++ )
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7229 {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7230 int edge;
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7231 const int mbm_xy = dir == 0 ? mb_xy -1 : h->top_mb_xy;
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7232 const int mbm_type = s->current_picture.mb_type[mbm_xy];
2454
300f1207768d simplify
michael
parents: 2453
diff changeset
7233 int start = h->slice_table[mbm_xy] == 255 ? 1 : 0;
300f1207768d simplify
michael
parents: 2453
diff changeset
7234
3101
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
7235 const int edges = (mb_type & (MB_TYPE_16x16|MB_TYPE_SKIP))
32903d6b5ef1 slightly faster loopfilter
lorenm
parents: 3089
diff changeset
7236 == (MB_TYPE_16x16|MB_TYPE_SKIP) ? 1 : 4;
2926
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
7237 // how often to recheck mv-based bS when iterating between edges
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
7238 const int mask_edge = (mb_type & (MB_TYPE_16x16 | (MB_TYPE_16x8 << dir))) ? 3 :
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
7239 (mb_type & (MB_TYPE_8x16 >> dir)) ? 1 : 0;
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
7240 // how often to recheck mv-based bS when iterating along each edge
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
7241 const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir));
dfdbef4bfdc5 no mixing of code and declarations
mru
parents: 2924
diff changeset
7242
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7243 if (first_vertical_edge_done) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7244 start = 1;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7245 first_vertical_edge_done = 0;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7246 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7247
2454
300f1207768d simplify
michael
parents: 2453
diff changeset
7248 if (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_table[mb_xy])
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7249 start = 1;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7250
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7251 if (FRAME_MBAFF && (dir == 1) && ((mb_y&1) == 0) && start == 0
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7252 && !IS_INTERLACED(mb_type)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7253 && IS_INTERLACED(mbm_type)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7254 ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7255 // This is a special case in the norm where the filtering must
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7256 // be done twice (one each of the field) even if we are in a
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7257 // frame macroblock.
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7258 //
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7259 static const int nnz_idx[4] = {4,5,6,3};
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7260 unsigned int tmp_linesize = 2 * linesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7261 unsigned int tmp_uvlinesize = 2 * uvlinesize;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7262 int mbn_xy = mb_xy - 2 * s->mb_stride;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7263 int qp, chroma_qp;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7264 int i, j;
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7265 int16_t bS[4];
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7266
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7267 for(j=0; j<2; j++, mbn_xy += s->mb_stride){
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7268 if( IS_INTRA(mb_type) ||
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7269 IS_INTRA(s->current_picture.mb_type[mbn_xy]) ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7270 bS[0] = bS[1] = bS[2] = bS[3] = 3;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7271 } else {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7272 const uint8_t *mbn_nnz = h->non_zero_count[mbn_xy];
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7273 for( i = 0; i < 4; i++ ) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7274 if( h->non_zero_count_cache[scan8[0]+i] != 0 ||
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7275 mbn_nnz[nnz_idx[i]] != 0 )
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7276 bS[i] = 2;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7277 else
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7278 bS[i] = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7279 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7280 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7281 // Do not use s->qscale as luma quantizer because it has not the same
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7282 // value in IPCM macroblocks.
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7283 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7284 tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, tmp_linesize, tmp_uvlinesize);
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7285 { int i; for (i = 0; i < 4; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7286 filter_mb_edgeh( h, &img_y[j*linesize], tmp_linesize, bS, qp );
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7287 chroma_qp = ( h->chroma_qp +
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7288 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7289 filter_mb_edgech( h, &img_cb[j*uvlinesize], tmp_uvlinesize, bS, chroma_qp );
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7290 filter_mb_edgech( h, &img_cr[j*uvlinesize], tmp_uvlinesize, bS, chroma_qp );
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7291 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7292
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7293 start = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7294 }
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7295
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7296 /* Calculate bS */
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7297 for( edge = start; edge < edges; edge++ ) {
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7298 /* mbn_xy: neighbor macroblock */
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7299 const int mbn_xy = edge > 0 ? mb_xy : mbm_xy;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7300 const int mbn_type = s->current_picture.mb_type[mbn_xy];
3645
47821be55b6c mmx implementation of deblocking strength decision.
lorenm
parents: 3519
diff changeset
7301 int16_t bS[4];
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7302 int qp;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7303
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7304 if( (edge&1) && IS_8x8DCT(mb_type) )
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7305 continue;
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7306
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7307 if( IS_INTRA(mb_type) ||
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7308 IS_INTRA(mbn_type) ) {
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7309 int value;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7310 if (edge == 0) {
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7311 if ( (!IS_INTERLACED(mb_type) && !IS_INTERLACED(mbm_type))
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7312 || ((FRAME_MBAFF || (s->picture_structure != PICT_FRAME)) && (dir == 0))
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7313 ) {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7314 value = 4;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7315 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7316 value = 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7317 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7318 } else {
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7319 value = 3;
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7320 }
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7321 bS[0] = bS[1] = bS[2] = bS[3] = value;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7322 } else {
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7323 int i, l;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7324 int mv_done;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7325
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7326 if( edge & mask_edge ) {
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7327 bS[0] = bS[1] = bS[2] = bS[3] = 0;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7328 mv_done = 1;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7329 }
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7330 else if( FRAME_MBAFF && IS_INTERLACED(mb_type ^ mbn_type)) {
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7331 bS[0] = bS[1] = bS[2] = bS[3] = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7332 mv_done = 1;
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7333 }
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7334 else if( mask_par0 && (edge || (mbn_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)))) ) {
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7335 int b_idx= 8 + 4 + edge * (dir ? 8:1);
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7336 int bn_idx= b_idx - (dir ? 8:1);
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7337 int v = 0;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7338 for( l = 0; !v && l < 1 + (h->slice_type == B_TYPE); l++ ) {
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7339 v |= ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] ||
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
7340 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 ||
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
7341 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit;
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7342 }
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7343 bS[0] = bS[1] = bS[2] = bS[3] = v;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7344 mv_done = 1;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7345 }
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7346 else
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7347 mv_done = 0;
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7348
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7349 for( i = 0; i < 4; i++ ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7350 int x = dir == 0 ? edge : i;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7351 int y = dir == 0 ? i : edge;
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
7352 int b_idx= 8 + 4 + x + 8*y;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
7353 int bn_idx= b_idx - (dir ? 8:1);
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
7354
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
7355 if( h->non_zero_count_cache[b_idx] != 0 ||
2449
6f719184e2b9 simplify deblock
michael
parents: 2447
diff changeset
7356 h->non_zero_count_cache[bn_idx] != 0 ) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7357 bS[i] = 2;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7358 }
2924
d98f385b3933 25% faster deblocking, 4-6% overall.
lorenm
parents: 2923
diff changeset
7359 else if(!mv_done)
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
7360 {
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
7361 bS[i] = 0;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
7362 for( l = 0; l < 1 + (h->slice_type == B_TYPE); l++ ) {
2629
202cd69d8d2e fix ref comparison in B-frame deblocker ('unused' and 'unavailable' were treated as different)
lorenm
parents: 2628
diff changeset
7363 if( ref2frm[h->ref_cache[l][b_idx]+2] != ref2frm[h->ref_cache[l][bn_idx]+2] ||
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
7364 FFABS( h->mv_cache[l][b_idx][0] - h->mv_cache[l][bn_idx][0] ) >= 4 ||
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
7365 FFABS( h->mv_cache[l][b_idx][1] - h->mv_cache[l][bn_idx][1] ) >= mvy_limit ) {
2523
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
7366 bS[i] = 1;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
7367 break;
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
7368 }
0fbbba9a52bc In-loop deblocking for B-frames.
lorenm
parents: 2519
diff changeset
7369 }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7370 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7371 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
7372
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
7373 if(bS[0]+bS[1]+bS[2]+bS[3] == 0)
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
7374 continue;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7375 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7376
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7377 /* Filter edge */
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
7378 // Do not use s->qscale as luma quantizer because it has not the same
2504
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
7379 // value in IPCM macroblocks.
f12657081093 INTRA PCM macroblocks support patch by (Loic )lll+ffmpeg m4x org)
michael
parents: 2498
diff changeset
7380 qp = ( s->current_picture.qscale_table[mb_xy] + s->current_picture.qscale_table[mbn_xy] + 1 ) >> 1;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
7381 //tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d, QPc:%d, QPcn:%d\n", mb_x, mb_y, dir, edge, qp, h->chroma_qp, s->current_picture.qscale_table[mbn_xy]);
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7382 tprintf("filter mb:%d/%d dir:%d edge:%d, QPy:%d ls:%d uvls:%d", mb_x, mb_y, dir, edge, qp, linesize, uvlinesize);
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7383 { int i; for (i = 0; i < 4; i++) tprintf(" bS[%d]:%d", i, bS[i]); tprintf("\n"); }
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7384 if( dir == 0 ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7385 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7386 if( (edge&1) == 0 ) {
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
7387 int chroma_qp = ( h->chroma_qp +
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7388 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7389 filter_mb_edgecv( h, &img_cb[2*edge], uvlinesize, bS, chroma_qp );
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7390 filter_mb_edgecv( h, &img_cr[2*edge], uvlinesize, bS, chroma_qp );
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7391 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7392 } else {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7393 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
7394 if( (edge&1) == 0 ) {
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
7395 int chroma_qp = ( h->chroma_qp +
2581
ae72796e722f This is the second patch for MBAFF support, this adds the deblocking
michael
parents: 2580
diff changeset
7396 get_chroma_qp( h->pps.chroma_qp_index_offset, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7397 filter_mb_edgech( h, &img_cb[2*edge*uvlinesize], uvlinesize, bS, chroma_qp );
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7398 filter_mb_edgech( h, &img_cr[2*edge*uvlinesize], uvlinesize, bS, chroma_qp );
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7399 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7400 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7401 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7402 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7403 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
7404
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7405 static int decode_slice(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7406 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7407 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7408
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7409 s->mb_skip_run= -1;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7410
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7411 if( h->pps.cabac ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7412 int i;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7413
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7414 /* realign */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7415 align_get_bits( &s->gb );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7416
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7417 /* init cabac */
3993
8b7c59b7af01 make state transition tables global as they are constant and the code is slightly faster that way
michael
parents: 3991
diff changeset
7418 ff_init_cabac_states( &h->cabac);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7419 ff_init_cabac_decoder( &h->cabac,
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7420 s->gb.buffer + get_bits_count(&s->gb)/8,
2116
48d9f86fb047 overread fix
michael
parents: 2110
diff changeset
7421 ( s->gb.size_in_bits - get_bits_count(&s->gb) + 7)/8);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7422 /* calculate pre-state */
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7423 for( i= 0; i < 460; i++ ) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7424 int pre;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7425 if( h->slice_type == I_TYPE )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7426 pre = clip( ((cabac_context_init_I[i][0] * s->qscale) >>4 ) + cabac_context_init_I[i][1], 1, 126 );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7427 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7428 pre = clip( ((cabac_context_init_PB[h->cabac_init_idc][i][0] * s->qscale) >>4 ) + cabac_context_init_PB[h->cabac_init_idc][i][1], 1, 126 );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7429
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7430 if( pre <= 63 )
3976
27e90123b346 reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents: 3972
diff changeset
7431 h->cabac_state[i] = 2 * ( 63 - pre ) + 0;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7432 else
3976
27e90123b346 reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
michael
parents: 3972
diff changeset
7433 h->cabac_state[i] = 2 * ( pre - 64 ) + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7434 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7435
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7436 for(;;){
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
7437 //START_TIMER
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7438 int ret = decode_mb_cabac(h);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
7439 int eos;
4008
b636f3d59283 prevent "mb level" get_cabac() calls from being inlined (3% faster decode_mb_cabac() on P3)
michael
parents: 4007
diff changeset
7440 //STOP_TIMER("decode_mb_cabac")
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7441
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
7442 if(ret>=0) hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7443
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7444 if( ret >= 0 && FRAME_MBAFF ) { //FIXME optimal? or let mb_decode decode 16x32 ?
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7445 s->mb_y++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7446
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
7447 if(ret>=0) ret = decode_mb_cabac(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7448
2844
5f20ab245501 prevent assert failures and infinite loops with broken streams
michael
parents: 2834
diff changeset
7449 if(ret>=0) hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7450 s->mb_y--;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7451 }
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
7452 eos = get_cabac_terminate( &h->cabac );
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7453
3948
3edbf131ee44 refill cabac variables in 16bit steps, 3% faster get_cabac()
michael
parents: 3947
diff changeset
7454 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) {
3297
9ae9653d706c decoders should (IMHO) not duplicate frames, the application can do this if it wants
michael
parents: 3291
diff changeset
7455 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d, bytestream (%d)\n", s->mb_x, s->mb_y, h->cabac.bytestream_end - h->cabac.bytestream);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7456 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7457 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7458 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7459
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7460 if( ++s->mb_x >= s->mb_width ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7461 s->mb_x = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7462 ff_draw_horiz_band(s, 16*s->mb_y, 16);
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7463 ++s->mb_y;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7464 if(FRAME_MBAFF) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
7465 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
7466 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7467 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7468
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7469 if( eos || s->mb_y >= s->mb_height ) {
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7470 tprintf("slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7471 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7472 return 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7473 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7474 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7475
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7476 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7477 for(;;){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7478 int ret = decode_mb_cavlc(h);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7479
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
7480 if(ret>=0) hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7481
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7482 if(ret>=0 && FRAME_MBAFF){ //FIXME optimal? or let mb_decode decode 16x32 ?
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7483 s->mb_y++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7484 ret = decode_mb_cavlc(h);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7485
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
7486 if(ret>=0) hl_decode_mb(h);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7487 s->mb_y--;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7488 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7489
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7490 if(ret<0){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7491 av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7492 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7493
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7494 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7495 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7496
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7497 if(++s->mb_x >= s->mb_width){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7498 s->mb_x=0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7499 ff_draw_horiz_band(s, 16*s->mb_y, 16);
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
7500 ++s->mb_y;
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7501 if(FRAME_MBAFF) {
2551
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
7502 ++s->mb_y;
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
7503 }
615995277bc5 MBAFF I slice no deblocking patch by (Loic >>lll+ffmpeg m4x org<<)
michael
parents: 2548
diff changeset
7504 if(s->mb_y >= s->mb_height){
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7505 tprintf("slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7506
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7507 if(get_bits_count(&s->gb) == s->gb.size_in_bits ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7508 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7509
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7510 return 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7511 }else{
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7512 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)&part_mask);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7513
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7514 return -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7515 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7516 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7517 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7518
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7519 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7520 tprintf("slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7521 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7522 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7523
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7524 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7525 }else{
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7526 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7527
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7528 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7529 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7530 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7531 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7532 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
7533
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7534 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7535 for(;s->mb_y < s->mb_height; s->mb_y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7536 for(;s->mb_x < s->mb_width; s->mb_x++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7537 int ret= decode_mb(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7538
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7539 hl_decode_mb(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7540
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7541 if(ret<0){
3177
8d1b2cc2a75b (f)printf --> av_log conversion
diego
parents: 3174
diff changeset
7542 av_log(s->avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7543 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7544
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7545 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7546 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7547
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7548 if(++s->mb_x >= s->mb_width){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7549 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7550 if(++s->mb_y >= s->mb_height){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7551 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7552 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7553
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7554 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7555 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7556 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7557
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7558 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7559 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7560 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7561 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7562
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7563 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7564 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7565 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, (AC_END|DC_END|MV_END)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7566
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7567 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7568 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7569 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7570
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7571 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7572 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7573 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7574 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7575 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7576 ff_draw_horiz_band(s, 16*s->mb_y, 16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7577 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7578 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7579 return -1; //not reached
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7580 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7581
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7582 static int decode_unregistered_user_data(H264Context *h, int size){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7583 MpegEncContext * const s = &h->s;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7584 uint8_t user_data[16+256];
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7585 int e, build, i;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7586
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7587 if(size<16)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7588 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7589
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7590 for(i=0; i<sizeof(user_data)-1 && i<size; i++){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7591 user_data[i]= get_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7592 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7593
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7594 user_data[i]= 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7595 e= sscanf(user_data+16, "x264 - core %d"/*%s - H.264/MPEG-4 AVC codec - Copyleft 2005 - http://www.videolan.org/x264.html*/, &build);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7596 if(e==1 && build>=0)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7597 h->x264_build= build;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7598
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7599 if(s->avctx->debug & FF_DEBUG_BUGS)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7600 av_log(s->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data+16);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7601
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7602 for(; i<size; i++)
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7603 skip_bits(&s->gb, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7604
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7605 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7606 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7607
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7608 static int decode_sei(H264Context *h){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7609 MpegEncContext * const s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7610
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7611 while(get_bits_count(&s->gb) + 16 < s->gb.size_in_bits){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7612 int size, type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7613
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7614 type=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7615 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7616 type+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7617 }while(get_bits(&s->gb, 8) == 255);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7618
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7619 size=0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7620 do{
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7621 size+= show_bits(&s->gb, 8);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7622 }while(get_bits(&s->gb, 8) == 255);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7623
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7624 switch(type){
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7625 case 5:
3318
8dc886b9568a typo me thinks ...
michael
parents: 3316
diff changeset
7626 if(decode_unregistered_user_data(h, size) < 0)
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7627 return -1;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7628 break;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7629 default:
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7630 skip_bits(&s->gb, 8*size);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7631 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7632
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7633 //FIXME check bits here
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7634 align_get_bits(&s->gb);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7635 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7636
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7637 return 0;
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7638 }
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
7639
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7640 static inline void decode_hrd_parameters(H264Context *h, SPS *sps){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7641 MpegEncContext * const s = &h->s;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7642 int cpb_count, i;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7643 cpb_count = get_ue_golomb(&s->gb) + 1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7644 get_bits(&s->gb, 4); /* bit_rate_scale */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7645 get_bits(&s->gb, 4); /* cpb_size_scale */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7646 for(i=0; i<cpb_count; i++){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7647 get_ue_golomb(&s->gb); /* bit_rate_value_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7648 get_ue_golomb(&s->gb); /* cpb_size_value_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7649 get_bits1(&s->gb); /* cbr_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7650 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7651 get_bits(&s->gb, 5); /* initial_cpb_removal_delay_length_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7652 get_bits(&s->gb, 5); /* cpb_removal_delay_length_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7653 get_bits(&s->gb, 5); /* dpb_output_delay_length_minus1 */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7654 get_bits(&s->gb, 5); /* time_offset_length */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7655 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7656
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7657 static inline int decode_vui_parameters(H264Context *h, SPS *sps){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7658 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7659 int aspect_ratio_info_present_flag, aspect_ratio_idc;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7660 int nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7661
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7662 aspect_ratio_info_present_flag= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7663
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7664 if( aspect_ratio_info_present_flag ) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7665 aspect_ratio_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7666 if( aspect_ratio_idc == EXTENDED_SAR ) {
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
7667 sps->sar.num= get_bits(&s->gb, 16);
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
7668 sps->sar.den= get_bits(&s->gb, 16);
3196
15157293beea fixing coverity warnig CID: 253 (reading over the end of the aspect_ratio array for illegal aspect ratios)
michael
parents: 3178
diff changeset
7669 }else if(aspect_ratio_idc < 14){
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
7670 sps->sar= pixel_aspect[aspect_ratio_idc];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7671 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
7672 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7673 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7674 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7675 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7676 sps->sar.num=
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
7677 sps->sar.den= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7678 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7679 // s->avctx->aspect_ratio= sar_width*s->width / (float)(s->height*sar_height);
2174
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7680
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7681 if(get_bits1(&s->gb)){ /* overscan_info_present_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7682 get_bits1(&s->gb); /* overscan_appropriate_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7683 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7684
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7685 if(get_bits1(&s->gb)){ /* video_signal_type_present_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7686 get_bits(&s->gb, 3); /* video_format */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7687 get_bits1(&s->gb); /* video_full_range_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7688 if(get_bits1(&s->gb)){ /* colour_description_present_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7689 get_bits(&s->gb, 8); /* colour_primaries */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7690 get_bits(&s->gb, 8); /* transfer_characteristics */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7691 get_bits(&s->gb, 8); /* matrix_coefficients */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7692 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7693 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7694
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7695 if(get_bits1(&s->gb)){ /* chroma_location_info_present_flag */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7696 get_ue_golomb(&s->gb); /* chroma_sample_location_type_top_field */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7697 get_ue_golomb(&s->gb); /* chroma_sample_location_type_bottom_field */
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7698 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7699
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7700 sps->timing_info_present_flag = get_bits1(&s->gb);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7701 if(sps->timing_info_present_flag){
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7702 sps->num_units_in_tick = get_bits_long(&s->gb, 32);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7703 sps->time_scale = get_bits_long(&s->gb, 32);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7704 sps->fixed_frame_rate_flag = get_bits1(&s->gb);
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7705 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
7706
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7707 nal_hrd_parameters_present_flag = get_bits1(&s->gb);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7708 if(nal_hrd_parameters_present_flag)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7709 decode_hrd_parameters(h, sps);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7710 vcl_hrd_parameters_present_flag = get_bits1(&s->gb);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7711 if(vcl_hrd_parameters_present_flag)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7712 decode_hrd_parameters(h, sps);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7713 if(nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7714 get_bits1(&s->gb); /* low_delay_hrd_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7715 get_bits1(&s->gb); /* pic_struct_present_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7716
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7717 sps->bitstream_restriction_flag = get_bits1(&s->gb);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7718 if(sps->bitstream_restriction_flag){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7719 get_bits1(&s->gb); /* motion_vectors_over_pic_boundaries_flag */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7720 get_ue_golomb(&s->gb); /* max_bytes_per_pic_denom */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7721 get_ue_golomb(&s->gb); /* max_bits_per_mb_denom */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7722 get_ue_golomb(&s->gb); /* log2_max_mv_length_horizontal */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7723 get_ue_golomb(&s->gb); /* log2_max_mv_length_vertical */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7724 sps->num_reorder_frames = get_ue_golomb(&s->gb);
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7725 get_ue_golomb(&s->gb); /* max_dec_frame_buffering */
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7726 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
7727
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7728 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7729 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7730
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7731 static void decode_scaling_list(H264Context *h, uint8_t *factors, int size,
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7732 const uint8_t *jvt_list, const uint8_t *fallback_list){
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7733 MpegEncContext * const s = &h->s;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7734 int i, last = 8, next = 8;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7735 const uint8_t *scan = size == 16 ? zigzag_scan : zigzag_scan8x8;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7736 if(!get_bits1(&s->gb)) /* matrix not written, we use the predicted one */
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7737 memcpy(factors, fallback_list, size*sizeof(uint8_t));
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7738 else
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7739 for(i=0;i<size;i++){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7740 if(next)
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7741 next = (last + get_se_golomb(&s->gb)) & 0xff;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7742 if(!i && !next){ /* matrix not written, we use the preset one */
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7743 memcpy(factors, jvt_list, size*sizeof(uint8_t));
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7744 break;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7745 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7746 last = factors[scan[i]] = next ? next : last;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7747 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7748 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7749
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7750 static void decode_scaling_matrices(H264Context *h, SPS *sps, PPS *pps, int is_sps,
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7751 uint8_t (*scaling_matrix4)[16], uint8_t (*scaling_matrix8)[64]){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7752 MpegEncContext * const s = &h->s;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7753 int fallback_sps = !is_sps && sps->scaling_matrix_present;
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7754 const uint8_t *fallback[4] = {
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7755 fallback_sps ? sps->scaling_matrix4[0] : default_scaling4[0],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7756 fallback_sps ? sps->scaling_matrix4[3] : default_scaling4[1],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7757 fallback_sps ? sps->scaling_matrix8[0] : default_scaling8[0],
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7758 fallback_sps ? sps->scaling_matrix8[1] : default_scaling8[1]
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7759 };
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7760 if(get_bits1(&s->gb)){
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7761 sps->scaling_matrix_present |= is_sps;
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7762 decode_scaling_list(h,scaling_matrix4[0],16,default_scaling4[0],fallback[0]); // Intra, Y
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7763 decode_scaling_list(h,scaling_matrix4[1],16,default_scaling4[0],scaling_matrix4[0]); // Intra, Cr
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7764 decode_scaling_list(h,scaling_matrix4[2],16,default_scaling4[0],scaling_matrix4[1]); // Intra, Cb
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7765 decode_scaling_list(h,scaling_matrix4[3],16,default_scaling4[1],fallback[1]); // Inter, Y
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7766 decode_scaling_list(h,scaling_matrix4[4],16,default_scaling4[1],scaling_matrix4[3]); // Inter, Cr
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7767 decode_scaling_list(h,scaling_matrix4[5],16,default_scaling4[1],scaling_matrix4[4]); // Inter, Cb
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7768 if(is_sps || pps->transform_8x8_mode){
3004
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7769 decode_scaling_list(h,scaling_matrix8[0],64,default_scaling8[0],fallback[2]); // Intra, Y
a22cf6e46b0e CQM: fix fallback to JVT scaling lists
lorenm
parents: 3003
diff changeset
7770 decode_scaling_list(h,scaling_matrix8[1],64,default_scaling8[1],fallback[3]); // Inter, Y
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7771 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7772 } else if(fallback_sps) {
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7773 memcpy(scaling_matrix4, sps->scaling_matrix4, 6*16*sizeof(uint8_t));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7774 memcpy(scaling_matrix8, sps->scaling_matrix8, 2*64*sizeof(uint8_t));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7775 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7776 }
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7777
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7778 static inline int decode_seq_parameter_set(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7779 MpegEncContext * const s = &h->s;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7780 int profile_idc, level_idc;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7781 int sps_id, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7782 SPS *sps;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7783
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7784 profile_idc= get_bits(&s->gb, 8);
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7785 get_bits1(&s->gb); //constraint_set0_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7786 get_bits1(&s->gb); //constraint_set1_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7787 get_bits1(&s->gb); //constraint_set2_flag
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7788 get_bits1(&s->gb); //constraint_set3_flag
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7789 get_bits(&s->gb, 4); // reserved
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7790 level_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7791 sps_id= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7792
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7793 sps= &h->sps_buffer[ sps_id ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7794 sps->profile_idc= profile_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7795 sps->level_idc= level_idc;
2312
cb958ec6dfee decode intra cabac mb_type cleanup
michael
parents: 2311
diff changeset
7796
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7797 if(sps->profile_idc >= 100){ //high profile
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7798 if(get_ue_golomb(&s->gb) == 3) //chroma_format_idc
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7799 get_bits1(&s->gb); //residual_color_transform_flag
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7800 get_ue_golomb(&s->gb); //bit_depth_luma_minus8
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7801 get_ue_golomb(&s->gb); //bit_depth_chroma_minus8
2763
01ed2c3b8f08 H.264 lossless mode
lorenm
parents: 2762
diff changeset
7802 sps->transform_bypass = get_bits1(&s->gb);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7803 decode_scaling_matrices(h, sps, NULL, 1, sps->scaling_matrix4, sps->scaling_matrix8);
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7804 }else
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7805 sps->scaling_matrix_present = 0;
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7806
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7807 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7808 sps->poc_type= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7809
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7810 if(sps->poc_type == 0){ //FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7811 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7812 } else if(sps->poc_type == 1){//FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7813 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7814 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7815 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7816 sps->poc_cycle_length= get_ue_golomb(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7817
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7818 for(i=0; i<sps->poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7819 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7820 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7821 if(sps->poc_type > 2){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
7822 av_log(h->s.avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7823 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7824 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7825
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7826 sps->ref_frame_count= get_ue_golomb(&s->gb);
2254
0dfe4e32b19c H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2227
diff changeset
7827 if(sps->ref_frame_count > MAX_PICTURE_COUNT-2){
0dfe4e32b19c H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2227
diff changeset
7828 av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n");
0dfe4e32b19c H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2227
diff changeset
7829 }
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7830 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7831 sps->mb_width= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7832 sps->mb_height= get_ue_golomb(&s->gb) + 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7833 if((unsigned)sps->mb_width >= INT_MAX/16 || (unsigned)sps->mb_height >= INT_MAX/16 ||
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
7834 avcodec_check_dimensions(NULL, 16*sps->mb_width, 16*sps->mb_height))
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
7835 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2417
diff changeset
7836
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7837 sps->frame_mbs_only_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7838 if(!sps->frame_mbs_only_flag)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7839 sps->mb_aff= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7840 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7841 sps->mb_aff= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7842
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7843 sps->direct_8x8_inference_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7844
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7845 #ifndef ALLOW_INTERLACE
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7846 if(sps->mb_aff)
3954
00a12ef7d800 output typo fixes
diego
parents: 3948
diff changeset
7847 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF support not included; enable it at compile-time.\n");
3316
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7848 #endif
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7849 if(!sps->direct_8x8_inference_flag && sps->mb_aff)
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7850 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + !direct_8x8_inference is not implemented\n");
7278f730af27 h264: MBAFF interlaced decoding
lorenm
parents: 3315
diff changeset
7851
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7852 sps->crop= get_bits1(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7853 if(sps->crop){
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7854 sps->crop_left = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7855 sps->crop_right = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7856 sps->crop_top = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7857 sps->crop_bottom= get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7858 if(sps->crop_left || sps->crop_top){
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
7859 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n");
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7860 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7861 }else{
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7862 sps->crop_left =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7863 sps->crop_right =
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7864 sps->crop_top =
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7865 sps->crop_bottom= 0;
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7866 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
7867
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7868 sps->vui_parameters_present_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7869 if( sps->vui_parameters_present_flag )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7870 decode_vui_parameters(h, sps);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7871
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7872 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7873 av_log(h->s.avctx, AV_LOG_DEBUG, "sps:%d profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s\n",
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7874 sps_id, sps->profile_idc, sps->level_idc,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7875 sps->poc_type,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7876 sps->ref_frame_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7877 sps->mb_width, sps->mb_height,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7878 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7879 sps->direct_8x8_inference_flag ? "8B8" : "",
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7880 sps->crop_left, sps->crop_right,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7881 sps->crop_top, sps->crop_bottom,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7882 sps->vui_parameters_present_flag ? "VUI" : ""
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7883 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7884 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7885 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7886 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7887
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7888 static inline int decode_picture_parameter_set(H264Context *h, int bit_length){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7889 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7890 int pps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7891 PPS *pps= &h->pps_buffer[pps_id];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7892
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7893 pps->sps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7894 pps->cabac= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7895 pps->pic_order_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7896 pps->slice_group_count= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7897 if(pps->slice_group_count > 1 ){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7898 pps->mb_slice_group_map_type= get_ue_golomb(&s->gb);
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
7899 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7900 switch(pps->mb_slice_group_map_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7901 case 0:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7902 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7903 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7904 | run_length[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7905 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7906 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7907 case 2:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7908 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7909 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7910 |{ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7911 | top_left_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7912 | bottom_right_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7913 | } | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7914 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7915 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7916 case 3:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7917 case 4:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7918 case 5:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7919 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7920 | slice_group_change_direction_flag |1 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7921 | slice_group_change_rate_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7922 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7923 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7924 case 6:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7925 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7926 | slice_group_id_cnt_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7927 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7928 |) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7929 | slice_group_id[ i ] |1 |u(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7930 #endif
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1187
diff changeset
7931 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7932 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7933 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7934 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7935 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7936 if(pps->ref_count[0] > 32 || pps->ref_count[1] > 32){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
7937 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7938 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7939 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7940
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7941 pps->weighted_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7942 pps->weighted_bipred_idc= get_bits(&s->gb, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7943 pps->init_qp= get_se_golomb(&s->gb) + 26;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7944 pps->init_qs= get_se_golomb(&s->gb) + 26;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7945 pps->chroma_qp_index_offset= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7946 pps->deblocking_filter_parameters_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7947 pps->constrained_intra_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7948 pps->redundant_pic_cnt_present = get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7949
3291
454de57e45cf reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents: 3285
diff changeset
7950 pps->transform_8x8_mode= 0;
454de57e45cf reinit quant matrices if pps is overwritten by another of the same pps_id.
lorenm
parents: 3285
diff changeset
7951 h->dequant_coeff_pps= -1; //contents of sps/pps can change even if id doesn't, so reinit
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7952 memset(pps->scaling_matrix4, 16, 6*16*sizeof(uint8_t));
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7953 memset(pps->scaling_matrix8, 16, 2*64*sizeof(uint8_t));
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7954
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7955 if(get_bits_count(&s->gb) < bit_length){
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7956 pps->transform_8x8_mode= get_bits1(&s->gb);
2919
71ca5ed04789 decode custom quant matrices.
lorenm
parents: 2898
diff changeset
7957 decode_scaling_matrices(h, &h->sps_buffer[pps->sps_id], pps, 0, pps->scaling_matrix4, pps->scaling_matrix8);
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7958 get_se_golomb(&s->gb); //second_chroma_qp_index_offset
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7959 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7960
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7961 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7962 av_log(h->s.avctx, AV_LOG_DEBUG, "pps:%d sps:%d %s slice_groups:%d ref:%d/%d %s qp:%d/%d/%d %s %s %s %s\n",
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7963 pps_id, pps->sps_id,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7964 pps->cabac ? "CABAC" : "CAVLC",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7965 pps->slice_group_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7966 pps->ref_count[0], pps->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7967 pps->weighted_pred ? "weighted" : "",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7968 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7969 pps->deblocking_filter_parameters_present ? "LPAR" : "",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7970 pps->constrained_intra_pred ? "CONSTR" : "",
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7971 pps->redundant_pic_cnt_present ? "REDU" : "",
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
7972 pps->transform_8x8_mode ? "8x8DCT" : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7973 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7974 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
7975
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7976 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7977 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7978
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7979 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7980 * finds the end of the current frame in the bitstream.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7981 * @return the position of the first byte of the next frame, or -1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7982 */
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7983 static int find_frame_end(H264Context *h, const uint8_t *buf, int buf_size){
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
7984 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7985 uint32_t state;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7986 ParseContext *pc = &(h->s.parse_context);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7987 //printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7988 // mb_addr= pc->mb_addr - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7989 state= pc->state;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7990 for(i=0; i<=buf_size; i++){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7991 if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7992 tprintf("find_frame_end new startcode = %08x, frame_start_found = %d, pos = %d\n", state, pc->frame_start_found, i);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7993 if(pc->frame_start_found){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7994 // If there isn't one more byte in the buffer
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7995 // the test on first_mb_in_slice cannot be done yet
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7996 // do it at next call.
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7997 if (i >= buf_size) break;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7998 if (buf[i] & 0x80) {
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
7999 // first_mb_in_slice is 0, probably the first nal of a new
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8000 // slice
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8001 tprintf("find_frame_end frame_end_found, state = %08x, pos = %d\n", state, i);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8002 pc->state=-1;
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8003 pc->frame_start_found= 0;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8004 return i-4;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8005 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8006 }
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8007 pc->frame_start_found = 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8008 }
2774
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8009 if((state&0xFFFFFF1F) == 0x107 || (state&0xFFFFFF1F) == 0x108 || (state&0xFFFFFF1F) == 0x109){
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8010 if(pc->frame_start_found){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8011 pc->state=-1;
2774
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8012 pc->frame_start_found= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8013 return i-4;
2774
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8014 }
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8015 }
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8016 if (i<buf_size)
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8017 state= (state<<8) | buf[i];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8018 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8019
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8020 pc->state= state;
1219
michaelni
parents: 1214
diff changeset
8021 return END_NOT_FOUND;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8022 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8023
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3409
diff changeset
8024 #ifdef CONFIG_H264_PARSER
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8025 static int h264_parse(AVCodecParserContext *s,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8026 AVCodecContext *avctx,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8027 uint8_t **poutbuf, int *poutbuf_size,
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8028 const uint8_t *buf, int buf_size)
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8029 {
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8030 H264Context *h = s->priv_data;
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8031 ParseContext *pc = &h->s.parse_context;
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8032 int next;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8033
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8034 next= find_frame_end(h, buf, buf_size);
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8035
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8036 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) {
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8037 *poutbuf = NULL;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8038 *poutbuf_size = 0;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8039 return buf_size;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8040 }
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8041
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8042 *poutbuf = (uint8_t *)buf;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8043 *poutbuf_size = buf_size;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8044 return next;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8045 }
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8046
2774
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8047 static int h264_split(AVCodecContext *avctx,
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8048 const uint8_t *buf, int buf_size)
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8049 {
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8050 int i;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8051 uint32_t state = -1;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8052 int has_sps= 0;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8053
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8054 for(i=0; i<=buf_size; i++){
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8055 if((state&0xFFFFFF1F) == 0x107)
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8056 has_sps=1;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8057 /* if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8058 }*/
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8059 if((state&0xFFFFFF00) == 0x100 && (state&0xFFFFFF1F) != 0x107 && (state&0xFFFFFF1F) != 0x108 && (state&0xFFFFFF1F) != 0x109){
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8060 if(has_sps){
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8061 while(i>4 && buf[i-5]==0) i--;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8062 return i-4;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8063 }
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8064 }
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8065 if (i<buf_size)
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8066 state= (state<<8) | buf[i];
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8067 }
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8068 return 0;
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8069 }
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3409
diff changeset
8070 #endif /* CONFIG_H264_PARSER */
2774
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8071
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8072 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8073 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8074 AVCodecContext * const avctx= s->avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8075 int buf_index=0;
1322
f78341ab5fba some warning fixes
al3x
parents: 1319
diff changeset
8076 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8077 int i;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
8078 for(i=0; i<50; i++){
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
8079 av_log(NULL, AV_LOG_ERROR,"%02X ", buf[i]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8080 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8081 #endif
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8082 h->slice_num = 0;
2766
0609f405e000 make decoder a little bit more tolerant to missing NAL units
michael
parents: 2763
diff changeset
8083 s->current_picture_ptr= NULL;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8084 for(;;){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8085 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8086 int dst_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8087 int bit_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8088 uint8_t *ptr;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8089 int i, nalsize = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8090
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8091 if(h->is_avc) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8092 if(buf_index >= buf_size) break;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8093 nalsize = 0;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8094 for(i = 0; i < h->nal_length_size; i++)
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8095 nalsize = (nalsize << 8) | buf[buf_index++];
3126
05a10f97d510 fix some crashes on negative nalsize.
lorenm
parents: 3125
diff changeset
8096 if(nalsize <= 1){
05a10f97d510 fix some crashes on negative nalsize.
lorenm
parents: 3125
diff changeset
8097 if(nalsize == 1){
05a10f97d510 fix some crashes on negative nalsize.
lorenm
parents: 3125
diff changeset
8098 buf_index++;
05a10f97d510 fix some crashes on negative nalsize.
lorenm
parents: 3125
diff changeset
8099 continue;
05a10f97d510 fix some crashes on negative nalsize.
lorenm
parents: 3125
diff changeset
8100 }else{
05a10f97d510 fix some crashes on negative nalsize.
lorenm
parents: 3125
diff changeset
8101 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: nal size %d\n", nalsize);
05a10f97d510 fix some crashes on negative nalsize.
lorenm
parents: 3125
diff changeset
8102 break;
05a10f97d510 fix some crashes on negative nalsize.
lorenm
parents: 3125
diff changeset
8103 }
05a10f97d510 fix some crashes on negative nalsize.
lorenm
parents: 3125
diff changeset
8104 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8105 } else {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8106 // start code prefix search
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8107 for(; buf_index + 3 < buf_size; buf_index++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8108 // this should allways succeed in the first iteration
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8109 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8110 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8111 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8112
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8113 if(buf_index+3 >= buf_size) break;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8114
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8115 buf_index+=3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8116 }
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8117
2401
46898a9fd6dc Fix avc1 if there is nore than one nal per mov frame
rtognimp
parents: 2396
diff changeset
8118 ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index);
3341
bd7a496e44c9 h264: accept rbsp_trailing longer than 1 byte
lorenm
parents: 3318
diff changeset
8119 while(ptr[dst_length - 1] == 0 && dst_length > 1)
bd7a496e44c9 h264: accept rbsp_trailing longer than 1 byte
lorenm
parents: 3318
diff changeset
8120 dst_length--;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8121 bit_length= 8*dst_length - decode_rbsp_trailing(ptr + dst_length - 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8122
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8123 if(s->avctx->debug&FF_DEBUG_STARTCODE){
2402
f9d4e1eddbc5 - correct several errors on the deblocking accross slice boundaries.
michael
parents: 2401
diff changeset
8124 av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", h->nal_unit_type, buf_index, buf_size, dst_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8125 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8126
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8127 if (h->is_avc && (nalsize != consumed))
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8128 av_log(h->s.avctx, AV_LOG_ERROR, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize);
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8129
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8130 buf_index += consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8131
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
8132 if( (s->hurry_up == 1 && h->nal_ref_idc == 0) //FIXME dont discard SEI id
2792
0a8c847ad5e7 skip_idct
michael
parents: 2781
diff changeset
8133 ||(avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8134 continue;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8135
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8136 switch(h->nal_unit_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8137 case NAL_IDR_SLICE:
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
8138 idr(h); //FIXME ensure we don't loose some frames if there is reordering
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8139 case NAL_SLICE:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8140 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8141 h->intra_gb_ptr=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8142 h->inter_gb_ptr= &s->gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8143 s->data_partitioning = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8144
2771
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
8145 if(decode_slice_header(h) < 0){
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
8146 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n");
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
8147 break;
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
8148 }
3161
e3e94632c6e9 keyframe flag was wrong if SEIs followed the keyframe
lorenm
parents: 3145
diff changeset
8149 s->current_picture_ptr->key_frame= (h->nal_unit_type == NAL_IDR_SLICE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8150 if(h->redundant_pic_count==0 && s->hurry_up < 5
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
8151 && (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc)
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
8152 && (avctx->skip_frame < AVDISCARD_BIDIR || h->slice_type!=B_TYPE)
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
8153 && (avctx->skip_frame < AVDISCARD_NONKEY || h->slice_type==I_TYPE)
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
8154 && avctx->skip_frame < AVDISCARD_ALL)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8155 decode_slice(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8156 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8157 case NAL_DPA:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8158 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8159 h->intra_gb_ptr=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8160 h->inter_gb_ptr= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8161 s->data_partitioning = 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8162
2771
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
8163 if(decode_slice_header(h) < 0){
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
8164 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n");
7da100c7403c keep decoding nal units after an error
michael
parents: 2766
diff changeset
8165 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8166 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8167 case NAL_DPB:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8168 init_get_bits(&h->intra_gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8169 h->intra_gb_ptr= &h->intra_gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8170 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8171 case NAL_DPC:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8172 init_get_bits(&h->inter_gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8173 h->inter_gb_ptr= &h->inter_gb;
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
8174
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8175 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning
2793
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
8176 && s->hurry_up < 5
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
8177 && (avctx->skip_frame < AVDISCARD_NONREF || h->nal_ref_idc)
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
8178 && (avctx->skip_frame < AVDISCARD_BIDIR || h->slice_type!=B_TYPE)
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
8179 && (avctx->skip_frame < AVDISCARD_NONKEY || h->slice_type==I_TYPE)
ae85da6c5c2f more fine grained skip_frame
michael
parents: 2792
diff changeset
8180 && avctx->skip_frame < AVDISCARD_ALL)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8181 decode_slice(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8182 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8183 case NAL_SEI:
2815
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
8184 init_get_bits(&s->gb, ptr, bit_length);
636133fccbdc workaround 'colocated mv if colocated block is L1 predicted' bug in x264
michael
parents: 2809
diff changeset
8185 decode_sei(h);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8186 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8187 case NAL_SPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8188 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8189 decode_seq_parameter_set(h);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8190
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8191 if(s->flags& CODEC_FLAG_LOW_DELAY)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8192 s->low_delay=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8193
2538
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
8194 if(avctx->has_b_frames < 2)
34b0996cc10d 10l (fix reordering when B-frames are not present)
lorenm
parents: 2537
diff changeset
8195 avctx->has_b_frames= !s->low_delay;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8196 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8197 case NAL_PPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8198 init_get_bits(&s->gb, ptr, bit_length);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8199
2755
975074f04b95 decode H.264 with 8x8 transform.
lorenm
parents: 2751
diff changeset
8200 decode_picture_parameter_set(h, bit_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8201
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8202 break;
2960
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
8203 case NAL_AUD:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
8204 case NAL_END_SEQUENCE:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
8205 case NAL_END_STREAM:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
8206 case NAL_FILLER_DATA:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
8207 case NAL_SPS_EXT:
be87ff950242 recognize some more nal types
lorenm
parents: 2937
diff changeset
8208 case NAL_AUXILIARY_SLICE:
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8209 break;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
8210 default:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2971
diff changeset
8211 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8212 }
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8213 }
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8214
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
8215 if(!s->current_picture_ptr) return buf_index; //no frame
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8216
2971
1c22981c3498 new qscale type to distinguish H264
henry
parents: 2967
diff changeset
8217 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_H264;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8218 s->current_picture_ptr->pict_type= s->pict_type;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8219
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8220 h->prev_frame_num_offset= h->frame_num_offset;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8221 h->prev_frame_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8222 if(s->current_picture_ptr->reference){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8223 h->prev_poc_msb= h->poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8224 h->prev_poc_lsb= h->poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8225 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8226 if(s->current_picture_ptr->reference)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8227 execute_ref_pic_marking(h, h->mmco, h->mmco_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8228
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8229 ff_er_frame_end(s);
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
8230
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8231 MPV_frame_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8232
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8233 return buf_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8234 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8235
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8236 /**
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
8237 * returns the number of bytes consumed for building the current frame
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8238 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8239 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8240 if(s->flags&CODEC_FLAG_TRUNCATED){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8241 pos -= s->parse_context.last_index;
2645
42528c1f0246 More spelling errors patch by (Kevin Baragona (kevinmb500 gawab com>)
michael
parents: 2641
diff changeset
8242 if(pos<0) pos=0; // FIXME remove (unneeded?)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8243
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8244 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8245 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8246 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8247 if(pos+10>buf_size) pos=buf_size; // oops ;)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8248
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8249 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8250 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8251 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8252
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8253 static int decode_frame(AVCodecContext *avctx,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8254 void *data, int *data_size,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8255 uint8_t *buf, int buf_size)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8256 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8257 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8258 MpegEncContext *s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8259 AVFrame *pict = data;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8260 int buf_index;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8261
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8262 s->flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1706
diff changeset
8263 s->flags2= avctx->flags2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8264
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8265 /* no supplementary picture */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8266 if (buf_size == 0) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8267 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8268 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8269
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8270 if(s->flags&CODEC_FLAG_TRUNCATED){
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8271 int next= find_frame_end(h, buf, buf_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8272
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8273 if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8274 return buf_size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8275 //printf("next:%d buf_size:%d last_index:%d\n", next, buf_size, s->parse_context.last_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8276 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8277
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8278 if(h->is_avc && !h->got_avcC) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8279 int i, cnt, nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8280 unsigned char *p = avctx->extradata;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8281 if(avctx->extradata_size < 7) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8282 av_log(avctx, AV_LOG_ERROR, "avcC too short\n");
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8283 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8284 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8285 if(*p != 1) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8286 av_log(avctx, AV_LOG_ERROR, "Unknown avcC version %d\n", *p);
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8287 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8288 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8289 /* sps and pps in the avcC always have length coded with 2 bytes,
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8290 so put a fake nal_length_size = 2 while parsing them */
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8291 h->nal_length_size = 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8292 // Decode sps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8293 cnt = *(p+5) & 0x1f; // Number of sps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8294 p += 6;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8295 for (i = 0; i < cnt; i++) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8296 nalsize = BE_16(p) + 2;
2867
7c7edddaa835 dont be so picky with .mp4 ... fixes Mr&MrsSmith.mp4
michael
parents: 2861
diff changeset
8297 if(decode_nal_units(h, p, nalsize) < 0) {
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8298 av_log(avctx, AV_LOG_ERROR, "Decoding sps %d from avcC failed\n", i);
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8299 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8300 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8301 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8302 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8303 // Decode pps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8304 cnt = *(p++); // Number of pps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8305 for (i = 0; i < cnt; i++) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8306 nalsize = BE_16(p) + 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8307 if(decode_nal_units(h, p, nalsize) != nalsize) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8308 av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i);
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8309 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8310 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8311 p += nalsize;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8312 }
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8313 // Now store right nal length size, that will be use to parse all other nals
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8314 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8315 // Do not reparse avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8316 h->got_avcC = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8317 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8318
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
8319 if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8320 if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8321 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8322 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8323
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8324 buf_index=decode_nal_units(h, buf, buf_size);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8325 if(buf_index < 0)
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8326 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8327
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8328 //FIXME do something with unavailable reference frames
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8329
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2623
diff changeset
8330 // if(ret==FRAME_SKIPPED) return get_consumed_bytes(s, buf_index, buf_size);
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
8331 if(!s->current_picture_ptr){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
8332 av_log(h->s.avctx, AV_LOG_DEBUG, "error, NO frame\n");
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
8333 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
8334 }
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
8335
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
8336 {
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
8337 Picture *out = s->current_picture_ptr;
2561
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
8338 #if 0 //decode order
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8339 *data_size = sizeof(AVFrame);
2561
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
8340 #else
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
8341 /* Sort B-frames into display order */
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
8342 Picture *cur = s->current_picture_ptr;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8343 Picture *prev = h->delayed_output_pic;
3298
9637da0a9c1b cosmetics (initalize variables where they are used)
michael
parents: 3297
diff changeset
8344 int i, pics, cross_idr, out_of_order, out_idx;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8345
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8346 if(h->sps.bitstream_restriction_flag
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8347 && s->avctx->has_b_frames < h->sps.num_reorder_frames){
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8348 s->avctx->has_b_frames = h->sps.num_reorder_frames;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8349 s->low_delay = 0;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8350 }
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
8351
3298
9637da0a9c1b cosmetics (initalize variables where they are used)
michael
parents: 3297
diff changeset
8352 pics = 0;
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
8353 while(h->delayed_pic[pics]) pics++;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
8354 h->delayed_pic[pics++] = cur;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8355 if(cur->reference == 0)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8356 cur->reference = 1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8357
3298
9637da0a9c1b cosmetics (initalize variables where they are used)
michael
parents: 3297
diff changeset
8358 cross_idr = 0;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8359 for(i=0; h->delayed_pic[i]; i++)
2649
b2e6c5e9240b fix decoding of conformace streams AUD_MW_E.264 and BA1_FT_C.264 again (there where last correctly decoded with h264.c rev 1.96)
michael
parents: 2648
diff changeset
8360 if(h->delayed_pic[i]->key_frame || h->delayed_pic[i]->poc==0)
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8361 cross_idr = 1;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8362
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
8363 out = h->delayed_pic[0];
3298
9637da0a9c1b cosmetics (initalize variables where they are used)
michael
parents: 3297
diff changeset
8364 out_idx = 0;
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8365 for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8366 if(h->delayed_pic[i]->poc < out->poc){
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
8367 out = h->delayed_pic[i];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
8368 out_idx = i;
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
8369 }
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8370
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8371 out_of_order = !cross_idr && prev && out->poc < prev->poc;
3125
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
8372 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames)
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
8373 { }
16f9d33c027d fix some crashes when missing frames
lorenm
parents: 3105
diff changeset
8374 else if(prev && pics <= s->avctx->has_b_frames)
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8375 out = prev;
2923
7fa9106be552 fix a crash on dropped frames
lorenm
parents: 2920
diff changeset
8376 else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8377 || (s->low_delay &&
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8378 ((!cross_idr && prev && out->poc > prev->poc + 2)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8379 || cur->pict_type == B_TYPE)))
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8380 {
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8381 s->low_delay = 0;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8382 s->avctx->has_b_frames++;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8383 out = prev;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8384 }
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8385 else if(out_of_order)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8386 out = prev;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8387
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8388 if(out_of_order || pics > s->avctx->has_b_frames){
2537
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
8389 for(i=out_idx; h->delayed_pic[i]; i++)
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
8390 h->delayed_pic[i] = h->delayed_pic[i+1];
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
8391 }
14fef0f3f532 H.264: decode arbitrary frame orders and allow B-frames as references.
lorenm
parents: 2536
diff changeset
8392
3297
9ae9653d706c decoders should (IMHO) not duplicate frames, the application can do this if it wants
michael
parents: 3291
diff changeset
8393 if(prev == out)
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8394 *data_size = 0;
2561
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
8395 else
eb72c01df6ed 10l (compile fix)
lorenm
parents: 2560
diff changeset
8396 *data_size = sizeof(AVFrame);
2560
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8397 if(prev && prev != out && prev->reference == 1)
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8398 prev->reference = 0;
bfba825ee300 Set keyframe flag only on IDR-frames (needed for reordering across I-frames).
lorenm
parents: 2553
diff changeset
8399 h->delayed_output_pic = out;
2441
358813ec4ca2 H.264 b ref pic list order and long term pictures patch by (Loic Le Loarer <loic.le-loarer polytechnique org>)
michael
parents: 2440
diff changeset
8400 #endif
2409
26778a857b5b Sort B-frames into display order.
lorenm
parents: 2404
diff changeset
8401
2937
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
8402 if(out)
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
8403 *pict= *(AVFrame*)out;
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
8404 else
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
8405 av_log(avctx, AV_LOG_DEBUG, "no picture\n");
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
8406 }
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
8407
e63bbb945ebd fix a crash on seeking to an invalid frame
lorenm
parents: 2935
diff changeset
8408 assert(pict->data[0] || !*data_size);
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1698
diff changeset
8409 ff_print_debug_info(s, pict);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8410 //printf("out %d\n", (int)pict->data[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8411 #if 0 //?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8412
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8413 /* Return the Picture timestamp as the frame number */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8414 /* we substract 1 because it is added on utils.c */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8415 avctx->frame_number = s->picture_number - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8416 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8417 return get_consumed_bytes(s, buf_index, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8418 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8419 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8420 static inline void fill_mb_avail(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8421 MpegEncContext * const s = &h->s;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
8422 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8423
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8424 if(s->mb_y){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
8425 h->mb_avail[0]= s->mb_x && h->slice_table[mb_xy - s->mb_stride - 1] == h->slice_num;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
8426 h->mb_avail[1]= h->slice_table[mb_xy - s->mb_stride ] == h->slice_num;
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
8427 h->mb_avail[2]= s->mb_x+1 < s->mb_width && h->slice_table[mb_xy - s->mb_stride + 1] == h->slice_num;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8428 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8429 h->mb_avail[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8430 h->mb_avail[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8431 h->mb_avail[2]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8432 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8433 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8434 h->mb_avail[4]= 1; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8435 h->mb_avail[5]= 0; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8436 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8437 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8438
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8439 #if 0 //selftest
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8440 #define COUNT 8000
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8441 #define SIZE (COUNT*40)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8442 int main(){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8443 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8444 uint8_t temp[SIZE];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8445 PutBitContext pb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8446 GetBitContext gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8447 // int int_temp[10000];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8448 DSPContext dsp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8449 AVCodecContext avctx;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8450
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8451 dsputil_init(&dsp, &avctx);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8452
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1453
diff changeset
8453 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8454 printf("testing unsigned exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8455 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8456 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8457 set_ue_golomb(&pb, i);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8458 STOP_TIMER("set_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8459 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8460 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8461
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8462 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8463 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8464 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8465
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8466 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8467
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8468 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8469 j= get_ue_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8470 if(j != i){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8471 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8472 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8473 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8474 STOP_TIMER("get_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8475 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8476
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8477
1524
alex
parents: 1522
diff changeset
8478 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8479 printf("testing signed exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8480 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8481 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8482 set_se_golomb(&pb, i - COUNT/2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8483 STOP_TIMER("set_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8484 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8485 flush_put_bits(&pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8486
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8487 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8488 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8489 int j, s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8490
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8491 s= show_bits(&gb, 24);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8492
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8493 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8494 j= get_se_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8495 if(j != i - COUNT/2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8496 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8497 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8498 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8499 STOP_TIMER("get_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8500 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8501
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8502 printf("testing 4x4 (I)DCT\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8503
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8504 DCTELEM block[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8505 uint8_t src[16], ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8506 uint64_t error= 0, max_error=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8507
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8508 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8509 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8510 // printf("%d %d %d\n", r1, r2, (r2-r1)*16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8511 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8512 ref[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8513 src[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8514 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8515
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8516 h264_diff_dct_c(block, src, ref, 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8517
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8518 //normalize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8519 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8520 // printf("%d ", block[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8521 block[j]= block[j]*4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8522 if(j&1) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8523 if(j&4) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8524 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8525 // printf("\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8526
2272
cd43603c46f9 move h264 idct to its own file and call via function pointer in DspContext
michael
parents: 2255
diff changeset
8527 s->dsp.h264_idct_add(ref, block, 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8528 /* for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8529 printf("%d ", ref[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8530 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8531 printf("\n");*/
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8532
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8533 for(j=0; j<16; j++){
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 4000
diff changeset
8534 int diff= FFABS(src[j] - ref[j]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8535
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8536 error+= diff*diff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8537 max_error= FFMAX(max_error, diff);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8538 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8539 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8540 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8541 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8542 printf("testing quantizer\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8543 for(qp=0; qp<52; qp++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8544 for(i=0; i<16; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8545 src1_block[i]= src2_block[i]= random()%255;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8546
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8547 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8548 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8549 printf("Testing NAL layer\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8550
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8551 uint8_t bitstream[COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8552 uint8_t nal[COUNT*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8553 H264Context h;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8554 memset(&h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8555
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8556 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8557 int zeros= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8558 int nal_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8559 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8560 int out_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8561 uint8_t *out;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8562 int j;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8563
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8564 for(j=0; j<COUNT; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8565 bitstream[j]= (random() % 255) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8566 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8567
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8568 for(j=0; j<zeros; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8569 int pos= random() % COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8570 while(bitstream[pos] == 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8571 pos++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8572 pos %= COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8573 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8574 bitstream[pos]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8575 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8576
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8577 START_TIMER
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8578
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8579 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8580 if(nal_length<0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8581 printf("encoding failed\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8582 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8583 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8584
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8585 out= decode_nal(&h, nal, &out_length, &consumed, nal_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8586
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8587 STOP_TIMER("NAL")
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8588
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8589 if(out_length != COUNT){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8590 printf("incorrect length %d %d\n", out_length, COUNT);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8591 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8592 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8593
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8594 if(consumed != nal_length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8595 printf("incorrect consumed length %d %d\n", nal_length, consumed);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8596 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8597 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8598
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8599 if(memcmp(bitstream, out, COUNT)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8600 printf("missmatch\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8601 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8602 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8603 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8604
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8605 printf("Testing RBSP\n");
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8606
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8607
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8608 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8609 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8610 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8611
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8612
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8613 static int decode_end(AVCodecContext *avctx)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8614 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8615 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8616 MpegEncContext *s = &h->s;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8617
2891
4c6eb826e9cb Just noticed there is a memory leak in h264.c with the usage of rbsp_buffer.
michael
parents: 2883
diff changeset
8618 av_freep(&h->rbsp_buffer);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8619 free_tables(h); //FIXME cleanup init stuff perhaps
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8620 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8621
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8622 // memset(h, 0, sizeof(H264Context));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2962
diff changeset
8623
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8624 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8625 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8626
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8627
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8628 AVCodec h264_decoder = {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8629 "h264",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8630 CODEC_TYPE_VIDEO,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8631 CODEC_ID_H264,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8632 sizeof(H264Context),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8633 decode_init,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8634 NULL,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8635 decode_end,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8636 decode_frame,
2453
f67b63ed036d avoid buf_size == 0 checks in every decoder
michael
parents: 2449
diff changeset
8637 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED | CODEC_CAP_DELAY,
2640
d5de8b677bad clear the DPB after seeking.
lorenm
parents: 2637
diff changeset
8638 .flush= flush_dpb,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8639 };
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8640
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3409
diff changeset
8641 #ifdef CONFIG_H264_PARSER
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8642 AVCodecParser h264_parser = {
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8643 { CODEC_ID_H264 },
2392
299f2d85d27d add multi slice support
michael
parents: 2384
diff changeset
8644 sizeof(H264Context),
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8645 NULL,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8646 h264_parse,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8647 ff_parse_close,
2774
3eddfe241bb9 support extracting sps/pps from bitstream and putting it in extradata
michael
parents: 2773
diff changeset
8648 h264_split,
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8649 };
3455
cc4b4ea83e29 --enable/disable parsers. Warning: some combinations are broken.
mru
parents: 3409
diff changeset
8650 #endif
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
8651
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
8652 #include "svq3.c"