annotate h264.c @ 2240:c46fed9b7575 libavcodec

simplify getsymbol patch by (Loren Merritt <lorenm at u dot washington dot edu>)
author michael
date Fri, 17 Sep 2004 23:51:36 +0000
parents bf414a07af2e
children 0dfe4e32b19c
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 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5 * This library is free software; you can redistribute it and/or
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
7 * License as published by the Free Software Foundation; either
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
8 * version 2 of the License, or (at your option) any later version.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
9 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
10 * This library is distributed in the hope that it will be useful,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
13 * Lesser General Public License for more details.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
14 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
16 * License along with this library; if not, write to the Free Software
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
18 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
19 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
20
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
21 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
22 * @file h264.c
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
23 * H.264 / AVC / MPEG4 part10 codec.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
24 * @author Michael Niedermayer <michaelni@gmx.at>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
25 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
26
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
27 #include "common.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
28 #include "dsputil.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
29 #include "avcodec.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
30 #include "mpegvideo.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
31 #include "h264data.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
32 #include "golomb.h"
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
33
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
34 #include "cabac.h"
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
35
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
36 #undef NDEBUG
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
37 #include <assert.h>
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
38
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
39 #define interlaced_dct interlaced_dct_is_a_bad_name
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
40 #define mb_intra mb_intra_isnt_initalized_see_mb_type
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
41
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
42 #define LUMA_DC_BLOCK_INDEX 25
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
43 #define CHROMA_DC_BLOCK_INDEX 26
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
44
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
45 #define CHROMA_DC_COEFF_TOKEN_VLC_BITS 8
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
46 #define COEFF_TOKEN_VLC_BITS 8
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
47 #define TOTAL_ZEROS_VLC_BITS 9
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
48 #define CHROMA_DC_TOTAL_ZEROS_VLC_BITS 3
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
49 #define RUN_VLC_BITS 3
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
50 #define RUN7_VLC_BITS 6
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
51
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
52 #define MAX_SPS_COUNT 32
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
53 #define MAX_PPS_COUNT 256
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
54
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
55 #define MAX_MMCO_COUNT 66
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
56
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
57 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
58 * Sequence parameter set
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
59 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
60 typedef struct SPS{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
61
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
62 int profile_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
63 int level_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
64 int log2_max_frame_num; ///< log2_max_frame_num_minus4 + 4
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
65 int poc_type; ///< pic_order_cnt_type
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
66 int log2_max_poc_lsb; ///< log2_max_pic_order_cnt_lsb_minus4
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
67 int delta_pic_order_always_zero_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
68 int offset_for_non_ref_pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
69 int offset_for_top_to_bottom_field;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
70 int poc_cycle_length; ///< num_ref_frames_in_pic_order_cnt_cycle
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
71 int ref_frame_count; ///< num_ref_frames
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
72 int gaps_in_frame_num_allowed_flag;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
73 int mb_width; ///< frame_width_in_mbs_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
74 int mb_height; ///< frame_height_in_mbs_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
75 int frame_mbs_only_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
76 int mb_aff; ///<mb_adaptive_frame_field_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
77 int direct_8x8_inference_flag;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
78 int crop; ///< frame_cropping_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
79 int crop_left; ///< frame_cropping_rect_left_offset
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
80 int crop_right; ///< frame_cropping_rect_right_offset
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
81 int crop_top; ///< frame_cropping_rect_top_offset
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
82 int crop_bottom; ///< frame_cropping_rect_bottom_offset
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
83 int vui_parameters_present_flag;
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
84 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
85 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
86 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
87 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
88 int fixed_frame_rate_flag;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
89 short offset_for_ref_frame[256]; //FIXME dyn aloc?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
90 }SPS;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
91
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
92 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
93 * Picture parameter set
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
94 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
95 typedef struct PPS{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
96 int sps_id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
97 int cabac; ///< entropy_coding_mode_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
98 int pic_order_present; ///< pic_order_present_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
99 int slice_group_count; ///< num_slice_groups_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
100 int mb_slice_group_map_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
101 int ref_count[2]; ///< num_ref_idx_l0/1_active_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
102 int weighted_pred; ///< weighted_pred_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
103 int weighted_bipred_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
104 int init_qp; ///< pic_init_qp_minus26 + 26
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
105 int init_qs; ///< pic_init_qs_minus26 + 26
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
106 int chroma_qp_index_offset;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
107 int deblocking_filter_parameters_present; ///< deblocking_filter_parameters_present_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
108 int constrained_intra_pred; ///< constrained_intra_pred_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
109 int redundant_pic_cnt_present; ///< redundant_pic_cnt_present_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
110 }PPS;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
111
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
112 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
113 * Memory management control operation opcode.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
114 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
115 typedef enum MMCOOpcode{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
116 MMCO_END=0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
117 MMCO_SHORT2UNUSED,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
118 MMCO_LONG2UNUSED,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
119 MMCO_SHORT2LONG,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
120 MMCO_SET_MAX_LONG,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
121 MMCO_RESET,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
122 MMCO_LONG,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
123 } MMCOOpcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
124
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
125 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
126 * Memory management control operation.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
127 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
128 typedef struct MMCO{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
129 MMCOOpcode opcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
130 int short_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
131 int long_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
132 } MMCO;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
133
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
134 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
135 * H264Context
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
136 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
137 typedef struct H264Context{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
138 MpegEncContext s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
139 int nal_ref_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
140 int nal_unit_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
141 #define NAL_SLICE 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
142 #define NAL_DPA 2
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
143 #define NAL_DPB 3
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
144 #define NAL_DPC 4
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
145 #define NAL_IDR_SLICE 5
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
146 #define NAL_SEI 6
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
147 #define NAL_SPS 7
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
148 #define NAL_PPS 8
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
149 #define NAL_PICTURE_DELIMITER 9
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
150 #define NAL_FILTER_DATA 10
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
151 uint8_t *rbsp_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
152 int rbsp_buffer_size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
153
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
154 /**
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
155 * Used to parse AVC variant of h264
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
156 */
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
157 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
158 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
159 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
160
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
161 int chroma_qp; //QPc
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
162
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
163 int prev_mb_skiped; //FIXME remove (IMHO not used)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
164
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
165 //prediction stuff
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
166 int chroma_pred_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
167 int intra16x16_pred_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
169 int8_t intra4x4_pred_mode_cache[5*8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
170 int8_t (*intra4x4_pred_mode)[8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
171 void (*pred4x4 [9+3])(uint8_t *src, uint8_t *topright, int stride);//FIXME move to dsp?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
172 void (*pred8x8 [4+3])(uint8_t *src, int stride);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
173 void (*pred16x16[4+3])(uint8_t *src, int stride);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
174 unsigned int topleft_samples_available;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
175 unsigned int top_samples_available;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
176 unsigned int topright_samples_available;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
177 unsigned int left_samples_available;
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
178 uint8_t (*top_border)[16+2*8];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
179 uint8_t left_border[17+2*9];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
180
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
181 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
182 * non zero coeff count cache.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
183 * is 64 if not available.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
184 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
185 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
186 uint8_t (*non_zero_count)[16];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
187
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
188 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
189 * Motion vector cache.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
190 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
191 int16_t mv_cache[2][5*8][2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
192 int8_t ref_cache[2][5*8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
193 #define LIST_NOT_USED -1 //FIXME rename?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
194 #define PART_NOT_AVAILABLE -2
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
195
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
196 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
197 * is 1 if the specific list MV&references are set to 0,0,-2.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
198 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
199 int mv_cache_clean[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
200
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
201 int block_offset[16+8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
202 int chroma_subblock_offset[16]; //FIXME remove
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
203
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
204 uint16_t *mb2b_xy; //FIXME are these 4 a good idea?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
205 uint16_t *mb2b8_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
206 int b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
207 int b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
208
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
209 int halfpel_flag;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
210 int thirdpel_flag;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
211
1319
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
212 int unknown_svq3_flag;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
213 int next_slice_index;
449f6e32b425 added support for B-frames and multiple slices
tmmm
parents: 1317
diff changeset
214
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
215 SPS sps_buffer[MAX_SPS_COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
216 SPS sps; ///< current sps
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
217
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
218 PPS pps_buffer[MAX_PPS_COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
219 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
220 * current pps
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
221 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
222 PPS pps; //FIXME move tp Picture perhaps? (->no) do we need that?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
223
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
224 int slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
225 uint8_t *slice_table_base;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
226 uint8_t *slice_table; ///< slice_table_base + mb_stride + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
227 int slice_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
228 int slice_type_fixed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
229
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
230 //interlacing specific flags
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
231 int mb_field_decoding_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
232
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
233 int sub_mb_type[4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
234
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
235 //POC stuff
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
236 int poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
237 int poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
238 int delta_poc_bottom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
239 int delta_poc[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
240 int frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
241 int prev_poc_msb; ///< poc_msb of the last reference pic for POC type 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
242 int prev_poc_lsb; ///< poc_lsb of the last reference pic for POC type 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
243 int frame_num_offset; ///< for POC type 2
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
244 int prev_frame_num_offset; ///< for POC type 2
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
245 int prev_frame_num; ///< frame_num of the last pic for POC type 1/2
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
246
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
247 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
248 * frame_num for frames or 2*frame_num for field pics.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
249 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
250 int curr_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
251
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
252 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
253 * max_frame_num or 2*max_frame_num for field pics.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
254 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
255 int max_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
256
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
257 //Weighted pred stuff
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
258 int luma_log2_weight_denom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
259 int chroma_log2_weight_denom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
260 int luma_weight[2][16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
261 int luma_offset[2][16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
262 int chroma_weight[2][16][2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
263 int chroma_offset[2][16][2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
264
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
265 //deblock
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
266 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
267 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
268 int slice_beta_offset;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
269
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
270 int redundant_pic_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
271
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
272 int direct_spatial_mv_pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
273
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
274 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
275 * num_ref_idx_l0/1_active_minus1 + 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
276 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
277 int ref_count[2];// FIXME split for AFF
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
278 Picture *short_ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
279 Picture *long_ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
280 Picture default_ref_list[2][32];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
281 Picture ref_list[2][32]; //FIXME size?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
282 Picture field_ref_list[2][32]; //FIXME size?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
283
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
284 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
285 * memory management control operations buffer.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
286 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
287 MMCO mmco[MAX_MMCO_COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
288 int mmco_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
289
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
290 int long_ref_count; ///< number of actual long term references
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
291 int short_ref_count; ///< number of actual short term references
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
292
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
293 //data partitioning
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
294 GetBitContext intra_gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
295 GetBitContext inter_gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
296 GetBitContext *intra_gb_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
297 GetBitContext *inter_gb_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
298
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
299 DCTELEM mb[16*24] __align8;
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
300
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
301 /**
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
302 * Cabac
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
303 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
304 CABACContext cabac;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
305 uint8_t cabac_state[399];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
306 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
307
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
308 /* 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
309 uint16_t *cbp_table;
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
310 /* 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
311 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
312 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
313 int16_t (*mvd_table[2])[2];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
314 int16_t mvd_cache[2][5*8][2];
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
315
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
316 }H264Context;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
317
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
318 static VLC coeff_token_vlc[4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
319 static VLC chroma_dc_coeff_token_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
320
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
321 static VLC total_zeros_vlc[15];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
322 static VLC chroma_dc_total_zeros_vlc[3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
323
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
324 static VLC run_vlc[6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
325 static VLC run7_vlc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
326
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
327 static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
328 static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
329 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
330
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
331 static inline uint32_t pack16to32(int a, int b){
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
332 #ifdef WORDS_BIGENDIAN
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
333 return (b&0xFFFF) + (a<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
334 #else
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
335 return (a&0xFFFF) + (b<<16);
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
336 #endif
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
337 }
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
338
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
339 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
340 * fill a rectangle.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
341 * @param h height of the recatangle, should be a constant
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
342 * @param w width of the recatangle, should be a constant
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
343 * @param size the size of val (1 or 4), should be a constant
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
344 */
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
345 static inline void fill_rectangle(void *vp, int w, int h, int stride, uint32_t val, int size){ //FIXME ensure this IS inlined
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
346 uint8_t *p= (uint8_t*)vp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
347 assert(size==1 || size==4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
348
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
349 w *= size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
350 stride *= size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
351
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
352 //FIXME check what gcc generates for 64 bit on x86 and possible write a 32 bit ver of it
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
353 if(w==2 && h==2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
354 *(uint16_t*)(p + 0)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
355 *(uint16_t*)(p + stride)= size==4 ? val : val*0x0101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
356 }else if(w==2 && h==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
357 *(uint16_t*)(p + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
358 *(uint16_t*)(p + 1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
359 *(uint16_t*)(p + 2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
360 *(uint16_t*)(p + 3*stride)= size==4 ? val : val*0x0101;
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
361 }else if(w==4 && h==1){
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
362 *(uint32_t*)(p + 0*stride)= size==4 ? val : val*0x01010101;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
363 }else if(w==4 && h==2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
364 *(uint32_t*)(p + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
365 *(uint32_t*)(p + 1*stride)= size==4 ? val : val*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
366 }else if(w==4 && h==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
367 *(uint32_t*)(p + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
368 *(uint32_t*)(p + 1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
369 *(uint32_t*)(p + 2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
370 *(uint32_t*)(p + 3*stride)= size==4 ? val : val*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
371 }else if(w==8 && h==1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
372 *(uint32_t*)(p + 0)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
373 *(uint32_t*)(p + 4)= size==4 ? val : val*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
374 }else if(w==8 && h==2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
375 *(uint32_t*)(p + 0 + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
376 *(uint32_t*)(p + 4 + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
377 *(uint32_t*)(p + 0 + 1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
378 *(uint32_t*)(p + 4 + 1*stride)= size==4 ? val : val*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
379 }else if(w==8 && h==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
380 *(uint64_t*)(p + 0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
381 *(uint64_t*)(p + 1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
382 *(uint64_t*)(p + 2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
383 *(uint64_t*)(p + 3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
384 }else if(w==16 && h==2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
385 *(uint64_t*)(p + 0+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
386 *(uint64_t*)(p + 8+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
387 *(uint64_t*)(p + 0+1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
388 *(uint64_t*)(p + 8+1*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
389 }else if(w==16 && h==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
390 *(uint64_t*)(p + 0+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
391 *(uint64_t*)(p + 8+0*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
392 *(uint64_t*)(p + 0+1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
393 *(uint64_t*)(p + 8+1*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
394 *(uint64_t*)(p + 0+2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
395 *(uint64_t*)(p + 8+2*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
396 *(uint64_t*)(p + 0+3*stride)=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
397 *(uint64_t*)(p + 8+3*stride)= size==4 ? val*0x0100000001ULL : val*0x0101010101010101ULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
398 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
399 assert(0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
400 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
401
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
402 static inline void fill_caches(H264Context *h, int mb_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
403 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
404 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
405 int topleft_xy, top_xy, topright_xy, left_xy[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
406 int topleft_type, top_type, topright_type, left_type[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
407 int left_block[4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
408 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
409
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
410 //wow what a mess, why didnt they simplify the interlacing&intra stuff, i cant imagine that these complex rules are worth it
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
411
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
412 if(h->sps.mb_aff){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
413 //FIXME
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
414 topleft_xy = 0; /* avoid warning */
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
415 top_xy = 0; /* avoid warning */
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
416 topright_xy = 0; /* avoid warning */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
417 }else{
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
418 topleft_xy = mb_xy-1 - s->mb_stride;
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
419 top_xy = mb_xy - s->mb_stride;
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
420 topright_xy= mb_xy+1 - s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
421 left_xy[0] = mb_xy-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
422 left_xy[1] = mb_xy-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
423 left_block[0]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
424 left_block[1]= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
425 left_block[2]= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
426 left_block[3]= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
427 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
428
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
429 topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
430 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
431 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
432 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
433 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
434
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
435 if(IS_INTRA(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
436 h->topleft_samples_available=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
437 h->top_samples_available=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
438 h->left_samples_available= 0xFFFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
439 h->topright_samples_available= 0xEEEA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
440
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
441 if(!IS_INTRA(top_type) && (top_type==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
442 h->topleft_samples_available= 0xB3FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
443 h->top_samples_available= 0x33FF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
444 h->topright_samples_available= 0x26EA;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
445 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
446 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
447 if(!IS_INTRA(left_type[i]) && (left_type[i]==0 || h->pps.constrained_intra_pred)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
448 h->topleft_samples_available&= 0xDF5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
449 h->left_samples_available&= 0x5F5F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
450 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
451 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
452
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
453 if(!IS_INTRA(topleft_type) && (topleft_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
454 h->topleft_samples_available&= 0x7FFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
455
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
456 if(!IS_INTRA(topright_type) && (topright_type==0 || h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
457 h->topright_samples_available&= 0xFBFF;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
458
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
459 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
460 if(IS_INTRA4x4(top_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
461 h->intra4x4_pred_mode_cache[4+8*0]= h->intra4x4_pred_mode[top_xy][4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
462 h->intra4x4_pred_mode_cache[5+8*0]= h->intra4x4_pred_mode[top_xy][5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
463 h->intra4x4_pred_mode_cache[6+8*0]= h->intra4x4_pred_mode[top_xy][6];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
464 h->intra4x4_pred_mode_cache[7+8*0]= h->intra4x4_pred_mode[top_xy][3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
465 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
466 int pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
467 if(IS_INTRA16x16(top_type) || (IS_INTER(top_type) && !h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
468 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
469 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
470 pred= -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
471 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
472 h->intra4x4_pred_mode_cache[4+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
473 h->intra4x4_pred_mode_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
474 h->intra4x4_pred_mode_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
475 h->intra4x4_pred_mode_cache[7+8*0]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
476 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
477 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
478 if(IS_INTRA4x4(left_type[i])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
479 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
480 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
481 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
482 int pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
483 if(IS_INTRA16x16(left_type[i]) || (IS_INTER(left_type[i]) && !h->pps.constrained_intra_pred))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
484 pred= 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
485 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
486 pred= -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
487 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
488 h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
489 h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= pred;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
490 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
491 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
492 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
493 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
494
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
495
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
496 /*
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
497 0 . T T. T T T T
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
498 1 L . .L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
499 2 L . .L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
500 3 . T TL . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
501 4 L . .L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
502 5 L . .. . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
503 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
504 //FIXME constraint_intra_pred & partitioning & nnz (lets hope this is just a typo in the spec)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
505 if(top_type){
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
506 h->non_zero_count_cache[4+8*0]= h->non_zero_count[top_xy][0];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
507 h->non_zero_count_cache[5+8*0]= h->non_zero_count[top_xy][1];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
508 h->non_zero_count_cache[6+8*0]= h->non_zero_count[top_xy][2];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
509 h->non_zero_count_cache[7+8*0]= h->non_zero_count[top_xy][3];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
510
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
511 h->non_zero_count_cache[1+8*0]= h->non_zero_count[top_xy][7];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
512 h->non_zero_count_cache[2+8*0]= h->non_zero_count[top_xy][8];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
513
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
514 h->non_zero_count_cache[1+8*3]= h->non_zero_count[top_xy][10];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
515 h->non_zero_count_cache[2+8*3]= h->non_zero_count[top_xy][11];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
516 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
517 h->non_zero_count_cache[4+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
518 h->non_zero_count_cache[5+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
519 h->non_zero_count_cache[6+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
520 h->non_zero_count_cache[7+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
521
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
522 h->non_zero_count_cache[1+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
523 h->non_zero_count_cache[2+8*0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
524
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
525 h->non_zero_count_cache[1+8*3]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
526 h->non_zero_count_cache[2+8*3]= 64;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
527 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
528
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
529 if(left_type[0]){
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
530 h->non_zero_count_cache[3+8*1]= h->non_zero_count[left_xy[0]][6];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
531 h->non_zero_count_cache[3+8*2]= h->non_zero_count[left_xy[0]][5];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
532 h->non_zero_count_cache[0+8*1]= h->non_zero_count[left_xy[0]][9]; //FIXME left_block
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
533 h->non_zero_count_cache[0+8*4]= h->non_zero_count[left_xy[0]][12];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
534 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
535 h->non_zero_count_cache[3+8*1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
536 h->non_zero_count_cache[3+8*2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
537 h->non_zero_count_cache[0+8*1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
538 h->non_zero_count_cache[0+8*4]= 64;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
539 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
540
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
541 if(left_type[1]){
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
542 h->non_zero_count_cache[3+8*3]= h->non_zero_count[left_xy[1]][4];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
543 h->non_zero_count_cache[3+8*4]= h->non_zero_count[left_xy[1]][3];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
544 h->non_zero_count_cache[0+8*2]= h->non_zero_count[left_xy[1]][8];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
545 h->non_zero_count_cache[0+8*5]= h->non_zero_count[left_xy[1]][11];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
546 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
547 h->non_zero_count_cache[3+8*3]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
548 h->non_zero_count_cache[3+8*4]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
549 h->non_zero_count_cache[0+8*2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
550 h->non_zero_count_cache[0+8*5]= 64;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
551 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
552
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
553 #if 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
554 if(IS_INTER(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
555 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
556 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
557 if((!IS_8X8(mb_type)) && !USES_LIST(mb_type, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
558 /*if(!h->mv_cache_clean[list]){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
559 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
560 memset(h->ref_cache[list], PART_NOT_AVAILABLE, 8*5*sizeof(int8_t));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
561 h->mv_cache_clean[list]= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
562 }*/
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
563 continue; //FIXME direct mode ...
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
564 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
565 h->mv_cache_clean[list]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
566
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
567 if(IS_INTER(topleft_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
568 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
569 const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
570 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
571 h->ref_cache[list][scan8[0] - 1 - 1*8]= s->current_picture.ref_index[list][b8_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
572 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
573 *(uint32_t*)h->mv_cache[list][scan8[0] - 1 - 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
574 h->ref_cache[list][scan8[0] - 1 - 1*8]= topleft_type ? LIST_NOT_USED : PART_NOT_AVAILABLE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
575 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
576
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
577 if(IS_INTER(top_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
578 const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
579 const int b8_xy= h->mb2b8_xy[top_xy] + h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
580 *(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
581 *(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
582 *(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
583 *(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
584 h->ref_cache[list][scan8[0] + 0 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
585 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
586 h->ref_cache[list][scan8[0] + 2 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
587 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
588 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
589 *(uint32_t*)h->mv_cache [list][scan8[0] + 0 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
590 *(uint32_t*)h->mv_cache [list][scan8[0] + 1 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
591 *(uint32_t*)h->mv_cache [list][scan8[0] + 2 - 1*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
592 *(uint32_t*)h->mv_cache [list][scan8[0] + 3 - 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
593 *(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
594 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
595
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
596 if(IS_INTER(topright_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
597 const int b_xy= h->mb2b_xy[topright_xy] + 3*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
598 const int b8_xy= h->mb2b8_xy[topright_xy] + h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
599 *(uint32_t*)h->mv_cache[list][scan8[0] + 4 - 1*8]= *(uint32_t*)s->current_picture.motion_val[list][b_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
600 h->ref_cache[list][scan8[0] + 4 - 1*8]= s->current_picture.ref_index[list][b8_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
601 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
602 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
603 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
604 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
605
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
606 //FIXME unify cleanup or sth
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
607 if(IS_INTER(left_type[0])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
608 const int b_xy= h->mb2b_xy[left_xy[0]] + 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
609 const int b8_xy= h->mb2b8_xy[left_xy[0]] + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
610 *(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
611 *(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]];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
612 h->ref_cache[list][scan8[0] - 1 + 0*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
613 h->ref_cache[list][scan8[0] - 1 + 1*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[0]>>1)];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
614 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
615 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 0*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
616 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 1*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
617 h->ref_cache[list][scan8[0] - 1 + 0*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
618 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
619 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
620
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
621 if(IS_INTER(left_type[1])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
622 const int b_xy= h->mb2b_xy[left_xy[1]] + 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
623 const int b8_xy= h->mb2b8_xy[left_xy[1]] + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
624 *(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
625 *(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]];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
626 h->ref_cache[list][scan8[0] - 1 + 2*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
627 h->ref_cache[list][scan8[0] - 1 + 3*8]= s->current_picture.ref_index[list][b8_xy + h->b8_stride*(left_block[2]>>1)];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
628 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
629 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 2*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
630 *(uint32_t*)h->mv_cache [list][scan8[0] - 1 + 3*8]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
631 h->ref_cache[list][scan8[0] - 1 + 2*8]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
632 h->ref_cache[list][scan8[0] - 1 + 3*8]= left_type[0] ? LIST_NOT_USED : PART_NOT_AVAILABLE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
633 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
634
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
635 h->ref_cache[list][scan8[5 ]+1] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
636 h->ref_cache[list][scan8[7 ]+1] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
637 h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewher else)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
638 h->ref_cache[list][scan8[4 ]] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
639 h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
640 *(uint32_t*)h->mv_cache [list][scan8[5 ]+1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
641 *(uint32_t*)h->mv_cache [list][scan8[7 ]+1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
642 *(uint32_t*)h->mv_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewher else)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
643 *(uint32_t*)h->mv_cache [list][scan8[4 ]]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
644 *(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
645
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
646 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
647 /* XXX beurk, Load mvd */
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
648 if(IS_INTER(topleft_type)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
649 const int b_xy = h->mb2b_xy[topleft_xy] + 3 + 3*h->b_stride;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
650 *(uint32_t*)h->mvd_cache[list][scan8[0] - 1 - 1*8]= *(uint32_t*)h->mvd_table[list][b_xy];
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
651 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
652 *(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
653 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
654
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
655 if(IS_INTER(top_type)){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
656 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
657 *(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
658 *(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
659 *(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
660 *(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
661 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
662 *(uint32_t*)h->mvd_cache [list][scan8[0] + 0 - 1*8]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
663 *(uint32_t*)h->mvd_cache [list][scan8[0] + 1 - 1*8]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
664 *(uint32_t*)h->mvd_cache [list][scan8[0] + 2 - 1*8]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
665 *(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
666 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
667 if(IS_INTER(left_type[0])){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
668 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
669 *(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
670 *(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
671 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
672 *(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
673 *(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
674 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
675 if(IS_INTER(left_type[1])){
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
676 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
677 *(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
678 *(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
679 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
680 *(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
681 *(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
682 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
683 *(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
684 *(uint32_t*)h->mvd_cache [list][scan8[7 ]+1]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
685 *(uint32_t*)h->mvd_cache [list][scan8[13]+1]= //FIXME remove past 3 (init somewher else)
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
686 *(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
687 *(uint32_t*)h->mvd_cache [list][scan8[12]]= 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
688 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
689 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
690 //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
691 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
692 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
693 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
694
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
695 static inline void write_back_intra_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
696 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
697 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
698
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
699 h->intra4x4_pred_mode[mb_xy][0]= h->intra4x4_pred_mode_cache[7+8*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
700 h->intra4x4_pred_mode[mb_xy][1]= h->intra4x4_pred_mode_cache[7+8*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
701 h->intra4x4_pred_mode[mb_xy][2]= h->intra4x4_pred_mode_cache[7+8*3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
702 h->intra4x4_pred_mode[mb_xy][3]= h->intra4x4_pred_mode_cache[7+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
703 h->intra4x4_pred_mode[mb_xy][4]= h->intra4x4_pred_mode_cache[4+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
704 h->intra4x4_pred_mode[mb_xy][5]= h->intra4x4_pred_mode_cache[5+8*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
705 h->intra4x4_pred_mode[mb_xy][6]= h->intra4x4_pred_mode_cache[6+8*4];
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 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
709 * 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
710 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
711 static inline int check_intra4x4_pred_mode(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
712 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
713 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
714 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
715 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
716
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
717 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
718 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
719 int status= top[ h->intra4x4_pred_mode_cache[scan8[0] + i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
720 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
721 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
722 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
723 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
724 h->intra4x4_pred_mode_cache[scan8[0] + i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
725 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
726 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
727 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
728
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
729 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
730 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
731 int status= left[ h->intra4x4_pred_mode_cache[scan8[0] + 8*i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
732 if(status<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
733 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
734 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
735 } else if(status){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
736 h->intra4x4_pred_mode_cache[scan8[0] + 8*i]= status;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
737 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
738 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
739 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
740
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
741 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
742 } //FIXME cleanup like next
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
743
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
744 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
745 * 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
746 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
747 static inline int check_intra_pred_mode(H264Context *h, int mode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
748 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
749 static const int8_t top [7]= {LEFT_DC_PRED8x8, 1,-1,-1};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
750 static const int8_t left[7]= { TOP_DC_PRED8x8,-1, 2,-1,DC_128_PRED8x8};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
751
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
752 if(mode < 0 || mode > 6)
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
753 return -1;
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
754
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
755 if(!(h->top_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
756 mode= top[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
757 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
758 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
759 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
760 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
761 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
762
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
763 if(!(h->left_samples_available&0x8000)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
764 mode= left[ mode ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
765 if(mode<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
766 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
767 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
768 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
769 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
770
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
771 return mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
772 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
773
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
774 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
775 * gets the predicted intra4x4 prediction mode.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
776 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
777 static inline int pred_intra_mode(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
778 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
779 const int left= h->intra4x4_pred_mode_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
780 const int top = h->intra4x4_pred_mode_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
781 const int min= FFMIN(left, top);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
782
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
783 tprintf("mode:%d %d min:%d\n", left ,top, min);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
784
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
785 if(min<0) return DC_PRED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
786 else return min;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
787 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
788
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
789 static inline void write_back_non_zero_count(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
790 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
791 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
792
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
793 h->non_zero_count[mb_xy][0]= h->non_zero_count_cache[4+8*4];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
794 h->non_zero_count[mb_xy][1]= h->non_zero_count_cache[5+8*4];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
795 h->non_zero_count[mb_xy][2]= h->non_zero_count_cache[6+8*4];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
796 h->non_zero_count[mb_xy][3]= h->non_zero_count_cache[7+8*4];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
797 h->non_zero_count[mb_xy][4]= h->non_zero_count_cache[7+8*3];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
798 h->non_zero_count[mb_xy][5]= h->non_zero_count_cache[7+8*2];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
799 h->non_zero_count[mb_xy][6]= h->non_zero_count_cache[7+8*1];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
800
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
801 h->non_zero_count[mb_xy][7]= h->non_zero_count_cache[1+8*2];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
802 h->non_zero_count[mb_xy][8]= h->non_zero_count_cache[2+8*2];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
803 h->non_zero_count[mb_xy][9]= h->non_zero_count_cache[2+8*1];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
804
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
805 h->non_zero_count[mb_xy][10]=h->non_zero_count_cache[1+8*5];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
806 h->non_zero_count[mb_xy][11]=h->non_zero_count_cache[2+8*5];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
807 h->non_zero_count[mb_xy][12]=h->non_zero_count_cache[2+8*4];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
808 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
809
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
810 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
811 * gets the predicted number of non zero coefficients.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
812 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
813 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
814 static inline int pred_non_zero_count(H264Context *h, int n){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
815 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
816 const int left= h->non_zero_count_cache[index8 - 1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
817 const int top = h->non_zero_count_cache[index8 - 8];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
818 int i= left + top;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
819
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
820 if(i<64) i= (i+1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
821
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
822 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
823
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
824 return i&31;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
825 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
826
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
827 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
828 const int topright_ref= h->ref_cache[list][ i - 8 + part_width ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
829
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
830 if(topright_ref != PART_NOT_AVAILABLE){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
831 *C= h->mv_cache[list][ i - 8 + part_width ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
832 return topright_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
833 }else{
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
834 tprintf("topright MV not available\n");
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
835
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
836 *C= h->mv_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
837 return h->ref_cache[list][ i - 8 - 1 ];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
838 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
839 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
840
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
841 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
842 * gets the predicted MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
843 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
844 * @param part_width the width of the partition (4, 8,16) -> (1, 2, 4)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
845 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
846 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
847 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
848 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
849 const int index8= scan8[n];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
850 const int top_ref= h->ref_cache[list][ index8 - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
851 const int left_ref= h->ref_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
852 const int16_t * const A= h->mv_cache[list][ index8 - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
853 const int16_t * const B= h->mv_cache[list][ index8 - 8 ];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
854 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
855 int diagonal_ref, match_count;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
856
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
857 assert(part_width==1 || part_width==2 || part_width==4);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
858
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
859 /* mv_cache
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
860 B . . A T T T T
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
861 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
862 U . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
863 U . . L . . , .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
864 . . . L . . . .
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
865 */
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
866
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
867 diagonal_ref= fetch_diagonal_mv(h, &C, index8, list, part_width);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
868 match_count= (diagonal_ref==ref) + (top_ref==ref) + (left_ref==ref);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
869 if(match_count > 1){ //most common
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
870 *mx= mid_pred(A[0], B[0], C[0]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
871 *my= mid_pred(A[1], B[1], C[1]);
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
872 }else if(match_count==1){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
873 if(left_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
874 *mx= A[0];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
875 *my= A[1];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
876 }else if(top_ref==ref){
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
877 *mx= B[0];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
878 *my= B[1];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
879 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
880 *mx= C[0];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
881 *my= C[1];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
882 }
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
883 }else{
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
884 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
885 *mx= A[0];
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
886 *my= A[1];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
887 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
888 *mx= mid_pred(A[0], B[0], C[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
889 *my= mid_pred(A[1], B[1], C[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
890 }
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
891 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
892
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
893 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
894 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
895
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
896 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
897 * gets the directionally predicted 16x8 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
898 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
899 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
900 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
901 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
902 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
903 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
904 const int top_ref= h->ref_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
905 const int16_t * const B= h->mv_cache[list][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
906
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
907 tprintf("pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d", top_ref, B[0], B[1], h->s.mb_x, h->s.mb_y, n, list);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
908
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
909 if(top_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
910 *mx= B[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
911 *my= B[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
912 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
913 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
914 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
915 const int left_ref= h->ref_cache[list][ scan8[8] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
916 const int16_t * const A= h->mv_cache[list][ scan8[8] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
917
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
918 tprintf("pred_16x8: (%2d %2d %2d) at %2d %2d %d list %d", 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
919
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
920 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
921 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
922 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
923 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
924 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
925 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
926
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
927 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
928 pred_motion(h, n, 4, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
929 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
930
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
931 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
932 * gets the directionally predicted 8x16 MV.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
933 * @param n the block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
934 * @param mx the x component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
935 * @param my the y component of the predicted motion vector
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
936 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
937 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
938 if(n==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
939 const int left_ref= h->ref_cache[list][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
940 const int16_t * const A= h->mv_cache[list][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
941
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
942 tprintf("pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d", 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
943
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
944 if(left_ref == ref){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
945 *mx= A[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
946 *my= A[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
947 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
948 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
949 }else{
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
950 const int16_t * C;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
951 int diagonal_ref;
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
952
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
953 diagonal_ref= fetch_diagonal_mv(h, &C, scan8[4], list, 2);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
954
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
955 tprintf("pred_8x16: (%2d %2d %2d) at %2d %2d %d list %d", 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
956
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
957 if(diagonal_ref == ref){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
958 *mx= C[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
959 *my= C[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
960 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
961 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
962 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
963
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
964 //RARE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
965 pred_motion(h, n, 2, list, ref, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
966 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
967
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
968 static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
969 const int top_ref = h->ref_cache[0][ scan8[0] - 8 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
970 const int left_ref= h->ref_cache[0][ scan8[0] - 1 ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
971
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
972 tprintf("pred_pskip: (%d) (%d) at %2d %2d", top_ref, left_ref, h->s.mb_x, h->s.mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
973
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
974 if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
975 || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
976 || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
977
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
978 *mx = *my = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
979 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
980 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
981
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
982 pred_motion(h, 0, 4, 0, 0, mx, my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
983
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
984 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
985 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
986
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
987 static inline void write_back_motion(H264Context *h, int mb_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
988 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
989 const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
990 const int b8_xy= 2*s->mb_x + 2*s->mb_y*h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
991 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
992
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
993 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
994 int y;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
995 if((!IS_8X8(mb_type)) && !USES_LIST(mb_type, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
996 if(1){ //FIXME skip or never read if mb_type doesnt use it
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
997 for(y=0; y<4; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
998 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 0 + y*h->b_stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
999 *(uint64_t*)s->current_picture.motion_val[list][b_xy + 2 + y*h->b_stride]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1000 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1001 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
1002 /* FIXME needed ? */
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1003 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
1004 *(uint64_t*)h->mvd_table[list][b_xy + 0 + y*h->b_stride]=
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1005 *(uint64_t*)h->mvd_table[list][b_xy + 2 + y*h->b_stride]= 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1006 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1007 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1008 for(y=0; y<2; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1009 *(uint16_t*)s->current_picture.motion_val[list][b8_xy + y*h->b8_stride]= (LIST_NOT_USED&0xFF)*0x0101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1010 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1011 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1012 continue; //FIXME direct mode ...
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1013 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1014
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1015 for(y=0; y<4; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1016 *(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
1017 *(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
1018 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1019 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
1020 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
1021 *(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
1022 *(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
1023 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
1024 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1025 for(y=0; y<2; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1026 s->current_picture.ref_index[list][b8_xy + 0 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+0 + 16*y];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1027 s->current_picture.ref_index[list][b8_xy + 1 + y*h->b8_stride]= h->ref_cache[list][scan8[0]+2 + 16*y];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1028 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1029 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1030 }
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 * Decodes a network abstraction layer unit.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1034 * @param consumed is the number of bytes used as input
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1035 * @param length is the length of the array
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1036 * @param dst_length is the number of decoded bytes FIXME here or a decode rbsp ttailing?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1037 * @returns decoded bytes, might be src+1 if no escapes
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1038 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1039 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
1040 int i, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1041 uint8_t *dst;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1042
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1043 // src[0]&0x80; //forbidden bit
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1044 h->nal_ref_idc= src[0]>>5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1045 h->nal_unit_type= src[0]&0x1F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1046
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1047 src++; length--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1048 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1049 for(i=0; i<length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1050 printf("%2X ", src[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1051 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1052 for(i=0; i+1<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1053 if(src[i]) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1054 if(i>0 && src[i-1]==0) i--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1055 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1056 if(src[i+2]!=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1057 /* startcode, so we must be past the end */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1058 length=i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1059 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1060 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1061 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1062 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1063
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1064 if(i>=length-1){ //no escaped 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1065 *dst_length= length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1066 *consumed= length+1; //+1 for the header
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1067 return src;
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 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1071 dst= h->rbsp_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1072
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1073 //printf("deoding esc\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1074 si=di=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1075 while(si<length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1076 //remove escapes (very rare 1:2^22)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1077 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1078 if(src[si+2]==3){ //escape
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1079 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1080 dst[di++]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1081 si+=3;
1957
54411768fa38 h264 nal decoding fix by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1956
diff changeset
1082 continue;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1083 }else //next start code
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1084 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1085 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1086
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1087 dst[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1088 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1089
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1090 *dst_length= di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1091 *consumed= si + 1;//+1 for the header
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1092 //FIXME store exact number of bits in the getbitcontext (its needed for decoding)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1093 return dst;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1094 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1095
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1096 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1097 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1098 * @param src the data which should be escaped
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1099 * @param dst the target buffer, dst+1 == src is allowed as a special case
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1100 * @param length the length of the src data
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1101 * @param dst_length the length of the dst array
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1102 * @returns length of escaped data in bytes or -1 if an error occured
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1103 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1104 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
1105 int i, escape_count, si, di;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1106 uint8_t *temp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1107
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1108 assert(length>=0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1109 assert(dst_length>0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1110
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1111 dst[0]= (h->nal_ref_idc<<5) + h->nal_unit_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1112
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1113 if(length==0) return 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1114
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1115 escape_count= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1116 for(i=0; i<length; i+=2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1117 if(src[i]) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1118 if(i>0 && src[i-1]==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1119 i--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1120 if(i+2<length && src[i+1]==0 && src[i+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1121 escape_count++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1122 i+=2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1123 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1124 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1125
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1126 if(escape_count==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1127 if(dst+1 != src)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1128 memcpy(dst+1, src, length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1129 return length + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1130 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1131
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1132 if(length + escape_count + 1> dst_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1133 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1134
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1135 //this should be damn rare (hopefully)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1136
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1137 h->rbsp_buffer= av_fast_realloc(h->rbsp_buffer, &h->rbsp_buffer_size, length + escape_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1138 temp= h->rbsp_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1139 //printf("encoding esc\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1140
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1141 si= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1142 di= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1143 while(si < length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1144 if(si+2<length && src[si]==0 && src[si+1]==0 && src[si+2]<=3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1145 temp[di++]= 0; si++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1146 temp[di++]= 0; si++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1147 temp[di++]= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1148 temp[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1149 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1150 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1151 temp[di++]= src[si++];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1152 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1153 memcpy(dst+1, temp, length+escape_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1154
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1155 assert(di == length+escape_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1156
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1157 return di + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1158 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1159
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1160 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1161 * write 1,10,100,1000,... for alignment, yes its exactly inverse to mpeg4
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1162 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1163 static void encode_rbsp_trailing(PutBitContext *pb){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1164 int length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1165 put_bits(pb, 1, 1);
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1754
diff changeset
1166 length= (-put_bits_count(pb))&7;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1167 if(length) put_bits(pb, length, 0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1168 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1169 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1170
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1171 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1172 * identifies the exact end of the bitstream
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1173 * @return the length of the trailing, or 0 if damaged
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1174 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1175 static int decode_rbsp_trailing(uint8_t *src){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1176 int v= *src;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1177 int r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1178
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
1179 tprintf("rbsp trailing %X\n", v);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1180
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1181 for(r=1; r<9; r++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1182 if(v&1) return r;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1183 v>>=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1184 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1185 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1186 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1187
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1188 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1189 * idct tranforms the 16 dc values and dequantize them.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1190 * @param qp quantization parameter
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1191 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1192 static void h264_luma_dc_dequant_idct_c(DCTELEM *block, int qp){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1193 const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1194 #define stride 16
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1195 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1196 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1197 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1198 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1199
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1200 //memset(block, 64, 2*256);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1201 //return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1202 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1203 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1204 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1205 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1206 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1207 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1208
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1209 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1210 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1211 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1212 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1213 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1214
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1215 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1216 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1217 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1218 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1219 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1220 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1221
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1222 block[stride*0 +offset]= ((z0 + z3)*qmul + 2)>>2; //FIXME think about merging this into decode_resdual
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1223 block[stride*2 +offset]= ((z1 + z2)*qmul + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1224 block[stride*8 +offset]= ((z1 - z2)*qmul + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1225 block[stride*10+offset]= ((z0 - z3)*qmul + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1226 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1227 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1228
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1229 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1230 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1231 * dct tranforms the 16 dc values.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1232 * @param qp quantization parameter ??? FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1233 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1234 static void h264_luma_dc_dct_c(DCTELEM *block/*, int qp*/){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1235 // const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1236 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1237 int temp[16]; //FIXME check if this is a good idea
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1238 static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1239 static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1240
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1241 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1242 const int offset= y_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1243 const int z0= block[offset+stride*0] + block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1244 const int z1= block[offset+stride*0] - block[offset+stride*4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1245 const int z2= block[offset+stride*1] - block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1246 const int z3= block[offset+stride*1] + block[offset+stride*5];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1247
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1248 temp[4*i+0]= z0+z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1249 temp[4*i+1]= z1+z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1250 temp[4*i+2]= z1-z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1251 temp[4*i+3]= z0-z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1252 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1253
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1254 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1255 const int offset= x_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1256 const int z0= temp[4*0+i] + temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1257 const int z1= temp[4*0+i] - temp[4*2+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1258 const int z2= temp[4*1+i] - temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1259 const int z3= temp[4*1+i] + temp[4*3+i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1260
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1261 block[stride*0 +offset]= (z0 + z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1262 block[stride*2 +offset]= (z1 + z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1263 block[stride*8 +offset]= (z1 - z2)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1264 block[stride*10+offset]= (z0 - z3)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1265 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1266 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1267 #endif
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1268
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1269 #undef xStride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1270 #undef stride
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1271
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1272 static void chroma_dc_dequant_idct_c(DCTELEM *block, int qp){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1273 const int qmul= dequant_coeff[qp][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1274 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1275 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1276 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1277
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1278 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1279 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1280 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1281 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1282
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1283 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1284 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1285 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1286 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1287
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1288 block[stride*0 + xStride*0]= ((a+c)*qmul + 0)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1289 block[stride*0 + xStride*1]= ((e+b)*qmul + 0)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1290 block[stride*1 + xStride*0]= ((a-c)*qmul + 0)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1291 block[stride*1 + xStride*1]= ((e-b)*qmul + 0)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1292 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1293
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1294 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1295 static void chroma_dc_dct_c(DCTELEM *block){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1296 const int stride= 16*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1297 const int xStride= 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1298 int a,b,c,d,e;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1299
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1300 a= block[stride*0 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1301 b= block[stride*0 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1302 c= block[stride*1 + xStride*0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1303 d= block[stride*1 + xStride*1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1304
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1305 e= a-b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1306 a= a+b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1307 b= c-d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1308 c= c+d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1309
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1310 block[stride*0 + xStride*0]= (a+c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1311 block[stride*0 + xStride*1]= (e+b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1312 block[stride*1 + xStride*0]= (a-c);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1313 block[stride*1 + xStride*1]= (e-b);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1314 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1315 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1316
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1317 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1318 * gets the chroma qp.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1319 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1320 static inline int get_chroma_qp(H264Context *h, int qscale){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1321
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1322 return chroma_qp[clip(qscale + h->pps.chroma_qp_index_offset, 0, 51)];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1323 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1324
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1325
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1326 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1327 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1328 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1329 static void h264_add_idct_c(uint8_t *dst, DCTELEM *block, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1330 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1331 uint8_t *cm = cropTbl + MAX_NEG_CROP;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1332
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1333 block[0] += 32;
1909
559e92baf533 fix decoding of qp<6
michael
parents: 1908
diff changeset
1334
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1335 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1336 const int z0= block[0 + 4*i] + block[2 + 4*i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1337 const int z1= block[0 + 4*i] - block[2 + 4*i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1338 const int z2= (block[1 + 4*i]>>1) - block[3 + 4*i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1339 const int z3= block[1 + 4*i] + (block[3 + 4*i]>>1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1340
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1341 block[0 + 4*i]= z0 + z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1342 block[1 + 4*i]= z1 + z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1343 block[2 + 4*i]= z1 - z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1344 block[3 + 4*i]= z0 - z3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1345 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1346
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1347 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1348 const int z0= block[i + 4*0] + block[i + 4*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1349 const int z1= block[i + 4*0] - block[i + 4*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1350 const int z2= (block[i + 4*1]>>1) - block[i + 4*3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1351 const int z3= block[i + 4*1] + (block[i + 4*3]>>1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1352
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1353 dst[i + 0*stride]= cm[ dst[i + 0*stride] + ((z0 + z3) >> 6) ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1354 dst[i + 1*stride]= cm[ dst[i + 1*stride] + ((z1 + z2) >> 6) ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1355 dst[i + 2*stride]= cm[ dst[i + 2*stride] + ((z1 - z2) >> 6) ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1356 dst[i + 3*stride]= cm[ dst[i + 3*stride] + ((z0 - z3) >> 6) ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1357 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1358 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1359
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1360 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1361 static void h264_diff_dct_c(DCTELEM *block, uint8_t *src1, uint8_t *src2, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1362 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1363 //FIXME try int temp instead of block
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1364
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1365 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1366 const int d0= src1[0 + i*stride] - src2[0 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1367 const int d1= src1[1 + i*stride] - src2[1 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1368 const int d2= src1[2 + i*stride] - src2[2 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1369 const int d3= src1[3 + i*stride] - src2[3 + i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1370 const int z0= d0 + d3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1371 const int z3= d0 - d3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1372 const int z1= d1 + d2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1373 const int z2= d1 - d2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1374
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1375 block[0 + 4*i]= z0 + z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1376 block[1 + 4*i]= 2*z3 + z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1377 block[2 + 4*i]= z0 - z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1378 block[3 + 4*i]= z3 - 2*z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1379 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1380
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1381 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1382 const int z0= block[0*4 + i] + block[3*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1383 const int z3= block[0*4 + i] - block[3*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1384 const int z1= block[1*4 + i] + block[2*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1385 const int z2= block[1*4 + i] - block[2*4 + i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1386
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1387 block[0*4 + i]= z0 + z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1388 block[1*4 + i]= 2*z3 + z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1389 block[2*4 + i]= z0 - z1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1390 block[3*4 + i]= z3 - 2*z2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1391 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1392 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
1393 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1394
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1395 //FIXME need to check that this doesnt overflow signed 32 bit for low qp, iam not sure, its very close
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1396 //FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1397 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
1398 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1399 const int * const quant_table= quant_coeff[qscale];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1400 const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1401 const unsigned int threshold1= (1<<QUANT_SHIFT) - bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1402 const unsigned int threshold2= (threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1403 int last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1404
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1405 if(seperate_dc){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1406 if(qscale<=18){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1407 //avoid overflows
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1408 const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1409 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT-2)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1410 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1411
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1412 int level= block[0]*quant_coeff[qscale+18][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1413 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1414 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1415 level= (dc_bias + level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1416 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1417 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1418 level= (dc_bias - level)>>(QUANT_SHIFT-2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1419 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1420 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1421 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1422 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1423 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1424 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1425 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1426 const int dc_bias= intra ? (1<<(QUANT_SHIFT+1))/3 : (1<<(QUANT_SHIFT+1))/6;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1427 const unsigned int dc_threshold1= (1<<(QUANT_SHIFT+1)) - dc_bias - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1428 const unsigned int dc_threshold2= (dc_threshold1<<1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1429
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1430 int level= block[0]*quant_table[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1431 if(((unsigned)(level+dc_threshold1))>dc_threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1432 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1433 level= (dc_bias + level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1434 block[0]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1435 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1436 level= (dc_bias - level)>>(QUANT_SHIFT+1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1437 block[0]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1438 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1439 // last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1440 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1441 block[0]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1442 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1443 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1444 last_non_zero= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1445 i=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1446 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1447 last_non_zero= -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1448 i=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1449 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1450
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1451 for(; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1452 const int j= scantable[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1453 int level= block[j]*quant_table[j];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1454
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1455 // if( bias+level >= (1<<(QMAT_SHIFT - 3))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1456 // || bias-level >= (1<<(QMAT_SHIFT - 3))){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1457 if(((unsigned)(level+threshold1))>threshold2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1458 if(level>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1459 level= (bias + level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1460 block[j]= level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1461 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1462 level= (bias - level)>>QUANT_SHIFT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1463 block[j]= -level;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1464 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1465 last_non_zero = i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1466 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1467 block[j]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1468 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1469 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1470
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1471 return last_non_zero;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1472 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1473
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1474 static void pred4x4_vertical_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1475 const uint32_t a= ((uint32_t*)(src-stride))[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1476 ((uint32_t*)(src+0*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1477 ((uint32_t*)(src+1*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1478 ((uint32_t*)(src+2*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1479 ((uint32_t*)(src+3*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1480 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1481
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1482 static void pred4x4_horizontal_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1483 ((uint32_t*)(src+0*stride))[0]= src[-1+0*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1484 ((uint32_t*)(src+1*stride))[0]= src[-1+1*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1485 ((uint32_t*)(src+2*stride))[0]= src[-1+2*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1486 ((uint32_t*)(src+3*stride))[0]= src[-1+3*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1487 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1488
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1489 static void pred4x4_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1490 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride]
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1491 + src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 4) >>3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1492
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1493 ((uint32_t*)(src+0*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1494 ((uint32_t*)(src+1*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1495 ((uint32_t*)(src+2*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1496 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1497 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1498
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1499 static void pred4x4_left_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1500 const int dc= ( src[-1+0*stride] + src[-1+1*stride] + src[-1+2*stride] + src[-1+3*stride] + 2) >>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1501
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1502 ((uint32_t*)(src+0*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1503 ((uint32_t*)(src+1*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1504 ((uint32_t*)(src+2*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1505 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1506 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1507
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1508 static void pred4x4_top_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1509 const int dc= ( src[-stride] + src[1-stride] + src[2-stride] + src[3-stride] + 2) >>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1510
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1511 ((uint32_t*)(src+0*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1512 ((uint32_t*)(src+1*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1513 ((uint32_t*)(src+2*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1514 ((uint32_t*)(src+3*stride))[0]= dc* 0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1515 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1516
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1517 static void pred4x4_128_dc_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1518 ((uint32_t*)(src+0*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1519 ((uint32_t*)(src+1*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1520 ((uint32_t*)(src+2*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1521 ((uint32_t*)(src+3*stride))[0]= 128U*0x01010101U;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1522 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1523
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1524
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1525 #define LOAD_TOP_RIGHT_EDGE\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1526 const int t4= topright[0];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1527 const int t5= topright[1];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1528 const int t6= topright[2];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1529 const int t7= topright[3];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1530
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1531 #define LOAD_LEFT_EDGE\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1532 const int l0= src[-1+0*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1533 const int l1= src[-1+1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1534 const int l2= src[-1+2*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1535 const int l3= src[-1+3*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1536
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1537 #define LOAD_TOP_EDGE\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1538 const int t0= src[ 0-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1539 const int t1= src[ 1-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1540 const int t2= src[ 2-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1541 const int t3= src[ 3-1*stride];\
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1542
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1543 static void pred4x4_down_right_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1544 const int lt= src[-1-1*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1545 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1546 LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1547
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1548 src[0+3*stride]=(l3 + 2*l2 + l1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1549 src[0+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1550 src[1+3*stride]=(l2 + 2*l1 + l0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1551 src[0+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1552 src[1+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1553 src[2+3*stride]=(l1 + 2*l0 + lt + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1554 src[0+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1555 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1556 src[2+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1557 src[3+3*stride]=(l0 + 2*lt + t0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1558 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1559 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1560 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1561 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1562 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1563 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1564 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1565
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1566 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1567 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1568 LOAD_TOP_RIGHT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1569 // LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1570
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1571 src[0+0*stride]=(t0 + t2 + 2*t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1572 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1573 src[0+1*stride]=(t1 + t3 + 2*t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1574 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1575 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1576 src[0+2*stride]=(t2 + t4 + 2*t3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1577 src[3+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1578 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1579 src[1+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1580 src[0+3*stride]=(t3 + t5 + 2*t4 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1581 src[3+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1582 src[2+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1583 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1584 src[3+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1585 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1586 src[3+3*stride]=(t6 + 3*t7 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1587 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1588
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1589 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1590 const int lt= src[-1-1*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1591 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1592 LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1593 const __attribute__((unused)) int unu= l3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1594
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1595 src[0+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1596 src[1+2*stride]=(lt + t0 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1597 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1598 src[2+2*stride]=(t0 + t1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1599 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1600 src[3+2*stride]=(t1 + t2 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1601 src[3+0*stride]=(t2 + t3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1602 src[0+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1603 src[1+3*stride]=(l0 + 2*lt + t0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1604 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1605 src[2+3*stride]=(lt + 2*t0 + t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1606 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1607 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1608 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1609 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1610 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1611 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1612
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1613 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1614 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1615 LOAD_TOP_RIGHT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1616 const __attribute__((unused)) int unu= t7;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1617
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1618 src[0+0*stride]=(t0 + t1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1619 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1620 src[0+2*stride]=(t1 + t2 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1621 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1622 src[1+2*stride]=(t2 + t3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1623 src[3+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1624 src[2+2*stride]=(t3 + t4+ 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1625 src[3+2*stride]=(t4 + t5+ 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1626 src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1627 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1628 src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1629 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1630 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1631 src[3+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1632 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1633 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1634 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1635
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1636 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1637 LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1638
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1639 src[0+0*stride]=(l0 + l1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1640 src[1+0*stride]=(l0 + 2*l1 + l2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1641 src[2+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1642 src[0+1*stride]=(l1 + l2 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1643 src[3+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1644 src[1+1*stride]=(l1 + 2*l2 + l3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1645 src[2+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1646 src[0+2*stride]=(l2 + l3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1647 src[3+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1648 src[1+2*stride]=(l2 + 2*l3 + l3 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1649 src[3+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1650 src[1+3*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1651 src[0+3*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1652 src[2+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1653 src[2+3*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1654 src[3+3*stride]=l3;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1655 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1656
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1657 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1658 const int lt= src[-1-1*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1659 LOAD_TOP_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1660 LOAD_LEFT_EDGE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1661 const __attribute__((unused)) int unu= t3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1662
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1663 src[0+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1664 src[2+1*stride]=(lt + l0 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1665 src[1+0*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1666 src[3+1*stride]=(l0 + 2*lt + t0 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1667 src[2+0*stride]=(lt + 2*t0 + t1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1668 src[3+0*stride]=(t0 + 2*t1 + t2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1669 src[0+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1670 src[2+2*stride]=(l0 + l1 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1671 src[1+1*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1672 src[3+2*stride]=(lt + 2*l0 + l1 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1673 src[0+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1674 src[2+3*stride]=(l1 + l2+ 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1675 src[1+2*stride]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1676 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1677 src[0+3*stride]=(l2 + l3 + 1)>>1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1678 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2;
1282
8988af3ae1e8 Warning and compatibility fixes.
mellum
parents: 1269
diff changeset
1679 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1680
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1681 static void pred16x16_vertical_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1682 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1683 const uint32_t a= ((uint32_t*)(src-stride))[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1684 const uint32_t b= ((uint32_t*)(src-stride))[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1685 const uint32_t c= ((uint32_t*)(src-stride))[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1686 const uint32_t d= ((uint32_t*)(src-stride))[3];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1687
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1688 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1689 ((uint32_t*)(src+i*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1690 ((uint32_t*)(src+i*stride))[1]= b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1691 ((uint32_t*)(src+i*stride))[2]= c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1692 ((uint32_t*)(src+i*stride))[3]= d;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1693 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1694 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1695
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1696 static void pred16x16_horizontal_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1697 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1698
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1699 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1700 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1701 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1702 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1703 ((uint32_t*)(src+i*stride))[3]= src[-1+i*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1704 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1705 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1706
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1707 static void pred16x16_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1708 int i, dc=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1709
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1710 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1711 dc+= src[-1+i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1712 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1713
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1714 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1715 dc+= src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1716 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1717
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1718 dc= 0x01010101*((dc + 16)>>5);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1719
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1720 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1721 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1722 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1723 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1724 ((uint32_t*)(src+i*stride))[3]= dc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1725 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1726 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1727
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1728 static void pred16x16_left_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1729 int i, dc=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1730
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1731 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1732 dc+= src[-1+i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1733 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1734
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1735 dc= 0x01010101*((dc + 8)>>4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1736
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1737 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1738 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1739 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1740 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1741 ((uint32_t*)(src+i*stride))[3]= dc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1742 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1743 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1744
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1745 static void pred16x16_top_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1746 int i, dc=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1747
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1748 for(i=0;i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1749 dc+= src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1750 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1751 dc= 0x01010101*((dc + 8)>>4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1752
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1753 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1754 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1755 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1756 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1757 ((uint32_t*)(src+i*stride))[3]= dc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1758 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1759 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1760
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1761 static void pred16x16_128_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1762 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1763
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1764 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1765 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1766 ((uint32_t*)(src+i*stride))[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1767 ((uint32_t*)(src+i*stride))[2]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1768 ((uint32_t*)(src+i*stride))[3]= 0x01010101U*128U;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1769 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1770 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1771
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
1772 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
1773 int i, j, k;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1774 int a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1775 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
1776 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
1777 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
1778 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
1779 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
1780 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
1781 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
1782 src1 += stride; src2 -= stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1783 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
1784 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
1785 }
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
1786 if(svq3){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
1787 H = ( 5*(H/4) ) / 16;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
1788 V = ( 5*(V/4) ) / 16;
1330
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1322
diff changeset
1789
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1322
diff changeset
1790 /* required for 100% accuracy */
c05c381a9c47 - fix PLANE_PRED8x8 prediction (H/V are swapped, this is correct!)
tmmm
parents: 1322
diff changeset
1791 i = H; H = V; V = i;
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
1792 }else{
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
1793 H = ( 5*H+32 ) >> 6;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
1794 V = ( 5*V+32 ) >> 6;
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
1795 }
1184
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1796
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1797 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
1798 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
1799 int b = a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1800 a += V;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1801 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
1802 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
1803 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
1804 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
1805 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
1806 b += 4*H;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1807 }
1184
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1808 src += stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1809 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1810 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1811
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
1812 static void pred16x16_plane_c(uint8_t *src, int stride){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
1813 pred16x16_plane_compat_c(src, stride, 0);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
1814 }
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
1815
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1816 static void pred8x8_vertical_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1817 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1818 const uint32_t a= ((uint32_t*)(src-stride))[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1819 const uint32_t b= ((uint32_t*)(src-stride))[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1820
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1821 for(i=0; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1822 ((uint32_t*)(src+i*stride))[0]= a;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1823 ((uint32_t*)(src+i*stride))[1]= b;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1824 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1825 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1826
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1827 static void pred8x8_horizontal_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1828 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1829
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1830 for(i=0; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1831 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1832 ((uint32_t*)(src+i*stride))[1]= src[-1+i*stride]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1833 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1834 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1835
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1836 static void pred8x8_128_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1837 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1838
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1839 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1840 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1841 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1842 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1843 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1844 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1845 ((uint32_t*)(src+i*stride))[1]= 0x01010101U*128U;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1846 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1847 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1848
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1849 static void pred8x8_left_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1850 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1851 int dc0, dc2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1852
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1853 dc0=dc2=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1854 for(i=0;i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1855 dc0+= src[-1+i*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1856 dc2+= src[-1+(i+4)*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1857 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1858 dc0= 0x01010101*((dc0 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1859 dc2= 0x01010101*((dc2 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1860
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1861 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1862 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1863 ((uint32_t*)(src+i*stride))[1]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1864 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1865 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1866 ((uint32_t*)(src+i*stride))[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1867 ((uint32_t*)(src+i*stride))[1]= dc2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1868 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1869 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1870
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1871 static void pred8x8_top_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1872 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1873 int dc0, dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1874
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1875 dc0=dc1=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1876 for(i=0;i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1877 dc0+= src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1878 dc1+= src[4+i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1879 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1880 dc0= 0x01010101*((dc0 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1881 dc1= 0x01010101*((dc1 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1882
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1883 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1884 ((uint32_t*)(src+i*stride))[0]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1885 ((uint32_t*)(src+i*stride))[1]= dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1886 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1887 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1888 ((uint32_t*)(src+i*stride))[0]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1889 ((uint32_t*)(src+i*stride))[1]= dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1890 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1891 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1892
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1893
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1894 static void pred8x8_dc_c(uint8_t *src, int stride){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1895 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1896 int dc0, dc1, dc2, dc3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1897
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1898 dc0=dc1=dc2=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1899 for(i=0;i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1900 dc0+= src[-1+i*stride] + src[i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1901 dc1+= src[4+i-stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1902 dc2+= src[-1+(i+4)*stride];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1903 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1904 dc3= 0x01010101*((dc1 + dc2 + 4)>>3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1905 dc0= 0x01010101*((dc0 + 4)>>3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1906 dc1= 0x01010101*((dc1 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1907 dc2= 0x01010101*((dc2 + 2)>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1908
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1909 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1910 ((uint32_t*)(src+i*stride))[0]= dc0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1911 ((uint32_t*)(src+i*stride))[1]= dc1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1912 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1913 for(i=4; i<8; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1914 ((uint32_t*)(src+i*stride))[0]= dc2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1915 ((uint32_t*)(src+i*stride))[1]= dc3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1916 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1917 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1918
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1919 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
1920 int j, k;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1921 int a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1922 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
1923 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
1924 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
1925 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
1926 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
1927 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
1928 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
1929 src1 += stride; src2 -= stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1930 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
1931 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
1932 }
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1933 H = ( 17*H+16 ) >> 5;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1934 V = ( 17*V+16 ) >> 5;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1935
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1936 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
1937 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
1938 int b = a;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1939 a += V;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1940 src[0] = cm[ (b ) >> 5 ];
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1941 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
1942 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
1943 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
1944 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
1945 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
1946 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
1947 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
1948 src += stride;
05a2ac8978ad faster 8x8 & 16x16 plane prediction by skal (massimin at planet-d dot net)
michaelni
parents: 1177
diff changeset
1949 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1950 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1951
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1952 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
1953 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1954 int src_x_offset, int src_y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1955 qpel_mc_func *qpix_op, h264_chroma_mc_func chroma_op){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1956 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1957 const int mx= h->mv_cache[list][ scan8[n] ][0] + src_x_offset*8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1958 const int my= h->mv_cache[list][ scan8[n] ][1] + src_y_offset*8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1959 const int luma_xy= (mx&3) + ((my&3)<<2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1960 uint8_t * src_y = pic->data[0] + (mx>>2) + (my>>2)*s->linesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1961 uint8_t * src_cb= pic->data[1] + (mx>>3) + (my>>3)*s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1962 uint8_t * src_cr= pic->data[2] + (mx>>3) + (my>>3)*s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1963 int extra_width= (s->flags&CODEC_FLAG_EMU_EDGE) ? 0 : 16; //FIXME increase edge?, IMHO not worth it
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1964 int extra_height= extra_width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1965 int emu=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1966 const int full_mx= mx>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1967 const int full_my= my>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1968
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1969 assert(pic->data[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1970
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1971 if(mx&7) extra_width -= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1972 if(my&7) extra_height -= 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1973
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1974 if( full_mx < 0-extra_width
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1975 || full_my < 0-extra_height
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1976 || full_mx + 16/*FIXME*/ > s->width + extra_width
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1977 || full_my + 16/*FIXME*/ > s->height + extra_height){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1282
diff changeset
1978 ff_emulated_edge_mc(s->edge_emu_buffer, src_y - 2 - 2*s->linesize, s->linesize, 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, s->width, s->height);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1979 src_y= s->edge_emu_buffer + 2 + 2*s->linesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1980 emu=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1981 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1982
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1983 qpix_op[luma_xy](dest_y, src_y, s->linesize); //FIXME try variable height perhaps?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1984 if(!square){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1985 qpix_op[luma_xy](dest_y + delta, src_y + delta, s->linesize);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1986 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1987
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1988 if(s->flags&CODEC_FLAG_GRAY) return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1989
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1990 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1282
diff changeset
1991 ff_emulated_edge_mc(s->edge_emu_buffer, src_cb, s->uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), s->width>>1, s->height>>1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1992 src_cb= s->edge_emu_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1993 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1994 chroma_op(dest_cb, src_cb, s->uvlinesize, chroma_height, mx&7, my&7);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1995
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1996 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1282
diff changeset
1997 ff_emulated_edge_mc(s->edge_emu_buffer, src_cr, s->uvlinesize, 9, 9/*FIXME*/, (mx>>3), (my>>3), s->width>>1, s->height>>1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1998 src_cr= s->edge_emu_buffer;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
1999 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2000 chroma_op(dest_cr, src_cr, s->uvlinesize, chroma_height, mx&7, my&7);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2001 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2002
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2003 static inline void mc_part(H264Context *h, int n, int square, int chroma_height, int delta,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2004 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2005 int x_offset, int y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2006 qpel_mc_func *qpix_put, h264_chroma_mc_func chroma_put,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2007 qpel_mc_func *qpix_avg, h264_chroma_mc_func chroma_avg,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2008 int list0, int list1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2009 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2010 qpel_mc_func *qpix_op= qpix_put;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2011 h264_chroma_mc_func chroma_op= chroma_put;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2012
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2013 dest_y += 2*x_offset + 2*y_offset*s-> linesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2014 dest_cb += x_offset + y_offset*s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2015 dest_cr += x_offset + y_offset*s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2016 x_offset += 8*s->mb_x;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2017 y_offset += 8*s->mb_y;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2018
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2019 if(list0){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2020 Picture *ref= &h->ref_list[0][ h->ref_cache[0][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2021 mc_dir_part(h, ref, n, square, chroma_height, delta, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2022 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2023 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2024
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2025 qpix_op= qpix_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2026 chroma_op= chroma_avg;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2027 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2028
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2029 if(list1){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2030 Picture *ref= &h->ref_list[1][ h->ref_cache[1][ scan8[n] ] ];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2031 mc_dir_part(h, ref, n, square, chroma_height, delta, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2032 dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2033 qpix_op, chroma_op);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2034 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2035 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2036
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2037 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
2038 qpel_mc_func (*qpix_put)[16], h264_chroma_mc_func (*chroma_put),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2039 qpel_mc_func (*qpix_avg)[16], h264_chroma_mc_func (*chroma_avg)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2040 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
2041 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2042 const int mb_type= s->current_picture.mb_type[mb_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2043
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2044 assert(IS_INTER(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2045
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2046 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2047 mc_part(h, 0, 1, 8, 0, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2048 qpix_put[0], chroma_put[0], qpix_avg[0], chroma_avg[0],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2049 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2050 }else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2051 mc_part(h, 0, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2052 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2053 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2054 mc_part(h, 8, 0, 4, 8, dest_y, dest_cb, dest_cr, 0, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2055 qpix_put[1], chroma_put[0], qpix_avg[1], chroma_avg[0],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2056 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2057 }else if(IS_8X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2058 mc_part(h, 0, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 0, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2059 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2060 IS_DIR(mb_type, 0, 0), IS_DIR(mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2061 mc_part(h, 4, 0, 8, 8*s->linesize, dest_y, dest_cb, dest_cr, 4, 0,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2062 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2063 IS_DIR(mb_type, 1, 0), IS_DIR(mb_type, 1, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2064 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2065 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2066
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2067 assert(IS_8X8(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2068
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2069 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2070 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2071 const int n= 4*i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2072 int x_offset= (i&1)<<2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2073 int y_offset= (i&2)<<1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2074
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2075 if(IS_SUB_8X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2076 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
2077 qpix_put[1], chroma_put[1], qpix_avg[1], chroma_avg[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2078 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2079 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2080 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
2081 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2082 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2083 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
2084 qpix_put[2], chroma_put[1], qpix_avg[2], chroma_avg[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2085 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2086 }else if(IS_SUB_4X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2087 mc_part(h, n , 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2088 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2089 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2090 mc_part(h, n+1, 0, 4, 4*s->linesize, dest_y, dest_cb, dest_cr, x_offset+2, y_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2091 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2092 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2093 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2094 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2095 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2096 for(j=0; j<4; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2097 int sub_x_offset= x_offset + 2*(j&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2098 int sub_y_offset= y_offset + (j&2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2099 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
2100 qpix_put[2], chroma_put[2], qpix_avg[2], chroma_avg[2],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2101 IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2102 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2103 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2104 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2105 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2106 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2107
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2108 static void decode_init_vlc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2109 static int done = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2110
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2111 if (!done) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2112 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2113 done = 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2114
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2115 init_vlc(&chroma_dc_coeff_token_vlc, CHROMA_DC_COEFF_TOKEN_VLC_BITS, 4*5,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2116 &chroma_dc_coeff_token_len [0], 1, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2117 &chroma_dc_coeff_token_bits[0], 1, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2118
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2119 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2120 init_vlc(&coeff_token_vlc[i], COEFF_TOKEN_VLC_BITS, 4*17,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2121 &coeff_token_len [i][0], 1, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2122 &coeff_token_bits[i][0], 1, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2123 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2124
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2125 for(i=0; i<3; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2126 init_vlc(&chroma_dc_total_zeros_vlc[i], CHROMA_DC_TOTAL_ZEROS_VLC_BITS, 4,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2127 &chroma_dc_total_zeros_len [i][0], 1, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2128 &chroma_dc_total_zeros_bits[i][0], 1, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2129 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2130 for(i=0; i<15; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2131 init_vlc(&total_zeros_vlc[i], TOTAL_ZEROS_VLC_BITS, 16,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2132 &total_zeros_len [i][0], 1, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2133 &total_zeros_bits[i][0], 1, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2134 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2135
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2136 for(i=0; i<6; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2137 init_vlc(&run_vlc[i], RUN_VLC_BITS, 7,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2138 &run_len [i][0], 1, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2139 &run_bits[i][0], 1, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2140 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2141 init_vlc(&run7_vlc, RUN7_VLC_BITS, 16,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2142 &run_len [6][0], 1, 1,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2143 &run_bits[6][0], 1, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2144 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2145 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2146
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2147 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2148 * Sets the intra prediction function pointers.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2149 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2150 static void init_pred_ptrs(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2151 // MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2152
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2153 h->pred4x4[VERT_PRED ]= pred4x4_vertical_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2154 h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2155 h->pred4x4[DC_PRED ]= pred4x4_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2156 h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2157 h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2158 h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2159 h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2160 h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2161 h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2162 h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2163 h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2164 h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2165
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2166 h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2167 h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2168 h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2169 h->pred8x8[PLANE_PRED8x8 ]= pred8x8_plane_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2170 h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2171 h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2172 h->pred8x8[DC_128_PRED8x8 ]= pred8x8_128_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2173
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2174 h->pred16x16[DC_PRED8x8 ]= pred16x16_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2175 h->pred16x16[VERT_PRED8x8 ]= pred16x16_vertical_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2176 h->pred16x16[HOR_PRED8x8 ]= pred16x16_horizontal_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2177 h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2178 h->pred16x16[LEFT_DC_PRED8x8]= pred16x16_left_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2179 h->pred16x16[TOP_DC_PRED8x8 ]= pred16x16_top_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2180 h->pred16x16[DC_128_PRED8x8 ]= pred16x16_128_dc_c;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2181 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2182
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2183 static void free_tables(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2184 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
2185 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
2186 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
2187 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
2188 av_freep(&h->mvd_table[1]);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2189 av_freep(&h->non_zero_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2190 av_freep(&h->slice_table_base);
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2191 av_freep(&h->top_border);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2192 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
2193
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2194 av_freep(&h->mb2b_xy);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2195 av_freep(&h->mb2b8_xy);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2196 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2197
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2198 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2199 * allocates tables.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2200 * needs widzh/height
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2201 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2202 static int alloc_tables(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2203 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
2204 const int big_mb_num= s->mb_stride * (s->mb_height+1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2205 int x,y;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2206
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2207 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
2208
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2209 CHECKED_ALLOCZ(h->non_zero_count , big_mb_num * 16 * sizeof(uint8_t))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2210 CHECKED_ALLOCZ(h->slice_table_base , big_mb_num * sizeof(uint8_t))
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2211 CHECKED_ALLOCZ(h->top_border , s->mb_width * (16+8+8) * sizeof(uint8_t))
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2212
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2213 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
2214 CHECKED_ALLOCZ(h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t))
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2215 CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t))
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
2216 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
2217 CHECKED_ALLOCZ(h->mvd_table[1], 32*big_mb_num * sizeof(uint16_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
2218 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
2219
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2220 memset(h->slice_table_base, -1, big_mb_num * sizeof(uint8_t));
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1174
diff changeset
2221 h->slice_table= h->slice_table_base + s->mb_stride + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2222
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2223 CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint16_t));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2224 CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint16_t));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2225 for(y=0; y<s->mb_height; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2226 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
2227 const int mb_xy= x + y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2228 const int b_xy = 4*x + 4*y*h->b_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2229 const int b8_xy= 2*x + 2*y*h->b8_stride;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2230
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2231 h->mb2b_xy [mb_xy]= b_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2232 h->mb2b8_xy[mb_xy]= b8_xy;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2233 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2234 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2235
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2236 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2237 fail:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2238 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2239 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2240 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2241
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2242 static void common_init(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2243 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2244
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2245 s->width = s->avctx->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2246 s->height = s->avctx->height;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2247 s->codec_id= s->avctx->codec->id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2248
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2249 init_pred_ptrs(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2250
1698
420cac032278 svq3 fix
michael
parents: 1636
diff changeset
2251 s->unrestricted_mv=1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2252 s->decode=1; //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2253 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2254
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2255 static int decode_init(AVCodecContext *avctx){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2256 H264Context *h= avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2257 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2258
1892
5ac49e7a1b8f init cleanup
michael
parents: 1786
diff changeset
2259 MPV_decode_defaults(s);
5ac49e7a1b8f init cleanup
michael
parents: 1786
diff changeset
2260
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2261 s->avctx = avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2262 common_init(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2263
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2264 s->out_format = FMT_H264;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2265 s->workaround_bugs= avctx->workaround_bugs;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2266
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2267 // set defaults
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2268 // s->decode_mb= ff_h263_decode_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2269 s->low_delay= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2270 avctx->pix_fmt= PIX_FMT_YUV420P;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2271
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2272 decode_init_vlc(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2273
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2274 if(avctx->codec_tag != 0x31637661) // avc1
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2275 h->is_avc = 0;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2276 else {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2277 if((avctx->extradata_size == 0) || (avctx->extradata == NULL)) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2278 av_log(avctx, AV_LOG_ERROR, "AVC codec requires avcC data\n");
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2279 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2280 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2281 h->is_avc = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2282 h->got_avcC = 0;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2283 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
2284
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2285 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2286 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2287
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2288 static void frame_start(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2289 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2290 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2291
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2292 MPV_frame_start(s, s->avctx);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2293 ff_er_frame_start(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2294 h->mmco_index=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2295
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2296 assert(s->linesize && s->uvlinesize);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2297
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2298 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2299 h->block_offset[i]= 4*((scan8[i] - scan8[0])&7) + 4*s->linesize*((scan8[i] - scan8[0])>>3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2300 h->chroma_subblock_offset[i]= 2*((scan8[i] - scan8[0])&7) + 2*s->uvlinesize*((scan8[i] - scan8[0])>>3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2301 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2302 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2303 h->block_offset[16+i]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2304 h->block_offset[20+i]= 4*((scan8[i] - scan8[0])&7) + 4*s->uvlinesize*((scan8[i] - scan8[0])>>3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2305 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2306
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2307 // s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2308 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2309
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2310 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
2311 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
2312 int i;
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2313
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2314 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
2315 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
2316 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
2317
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2318 h->left_border[0]= h->top_border[s->mb_x][15];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2319 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
2320 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
2321 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2322
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2323 *(uint64_t*)(h->top_border[s->mb_x]+0)= *(uint64_t*)(src_y + 16*linesize);
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2324 *(uint64_t*)(h->top_border[s->mb_x]+8)= *(uint64_t*)(src_y +8+16*linesize);
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2325
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2326 if(!(s->flags&CODEC_FLAG_GRAY)){
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2327 h->left_border[17 ]= h->top_border[s->mb_x][16+7];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2328 h->left_border[17+9]= h->top_border[s->mb_x][24+7];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2329 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
2330 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
2331 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
2332 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2333 *(uint64_t*)(h->top_border[s->mb_x]+16)= *(uint64_t*)(src_cb+8*uvlinesize);
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2334 *(uint64_t*)(h->top_border[s->mb_x]+24)= *(uint64_t*)(src_cr+8*uvlinesize);
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2335 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2336 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2337
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2338 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
2339 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
2340 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
2341 uint64_t temp64;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2342 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
2343 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
2344
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2345 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
2346 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
2347 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
2348
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2349 #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
2350 t= a;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2351 if(xchg)\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2352 a= b;\
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2353 b= t;
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2354
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2355 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2356 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
2357 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
2358 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2359 }
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2360
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2361 if(deblock_top){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2362 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+0), *(uint64_t*)(src_y +1), temp64, xchg);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2363 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+8), *(uint64_t*)(src_y +9), temp64, 1);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2364 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2365
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2366 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
2367 if(deblock_left){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2368 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
2369 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
2370 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
2371 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2372 }
2200
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2373 if(deblock_top){
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2374 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+16), *(uint64_t*)(src_cb+1), temp64, 1);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2375 XCHG(*(uint64_t*)(h->top_border[s->mb_x]+24), *(uint64_t*)(src_cr+1), temp64, 1);
733c60a6e30c h264 deblocking crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
michael
parents: 2175
diff changeset
2376 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2377 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2378 }
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2379
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2380 static void hl_decode_mb(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2381 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2382 const int mb_x= s->mb_x;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2383 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
2384 const int mb_xy= mb_x + mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2385 const int mb_type= s->current_picture.mb_type[mb_xy];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2386 uint8_t *dest_y, *dest_cb, *dest_cr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2387 int linesize, uvlinesize /*dct_offset*/;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2388 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2389
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2390 if(!s->decode)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2391 return;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2392
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2393 if(s->mb_skiped){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2394 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2395
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2396 dest_y = s->current_picture.data[0] + (mb_y * 16* s->linesize ) + mb_x * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2397 dest_cb = s->current_picture.data[1] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2398 dest_cr = s->current_picture.data[2] + (mb_y * 8 * s->uvlinesize) + mb_x * 8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2399
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2400 if (h->mb_field_decoding_flag) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2401 linesize = s->linesize * 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2402 uvlinesize = s->uvlinesize * 2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2403 if(mb_y&1){ //FIXME move out of this func?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2404 dest_y -= s->linesize*15;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2405 dest_cb-= s->linesize*7;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2406 dest_cr-= s->linesize*7;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2407 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2408 } else {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2409 linesize = s->linesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2410 uvlinesize = s->uvlinesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2411 // dct_offset = s->linesize * 16;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2412 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2413
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2414 if(IS_INTRA(mb_type)){
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2415 if(h->deblocking_filter)
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2416 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 1);
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2417
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2418 if(!(s->flags&CODEC_FLAG_GRAY)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2419 h->pred8x8[ h->chroma_pred_mode ](dest_cb, uvlinesize);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2420 h->pred8x8[ h->chroma_pred_mode ](dest_cr, uvlinesize);
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 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2424 if(!s->encoding){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2425 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2426 uint8_t * const ptr= dest_y + h->block_offset[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2427 uint8_t *topright= ptr + 4 - linesize;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2428 const int topright_avail= (h->topright_samples_available<<i)&0x8000;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2429 const int dir= h->intra4x4_pred_mode_cache[ scan8[i] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2430 int tr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2431
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2432 if(!topright_avail){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2433 tr= ptr[3 - linesize]*0x01010101;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2434 topright= (uint8_t*) &tr;
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2435 }else if(i==5 && h->deblocking_filter){
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2436 tr= *(uint32_t*)h->top_border[mb_x+1];
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2437 topright= (uint8_t*) &tr;
1168
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 h->pred4x4[ dir ](ptr, topright, linesize);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2441 if(h->non_zero_count_cache[ scan8[i] ]){
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2442 if(s->codec_id == CODEC_ID_H264)
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2443 h264_add_idct_c(ptr, h->mb + i*16, linesize);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2444 else
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2445 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2446 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2447 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2448 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2449 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2450 h->pred16x16[ h->intra16x16_pred_mode ](dest_y , linesize);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2451 if(s->codec_id == CODEC_ID_H264)
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2452 h264_luma_dc_dequant_idct_c(h->mb, s->qscale);
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2453 else
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2454 svq3_luma_dc_dequant_idct_c(h->mb, s->qscale);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2455 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2456 if(h->deblocking_filter)
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2457 xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0);
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2458 }else if(s->codec_id == CODEC_ID_H264){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2459 hl_motion(h, dest_y, dest_cb, dest_cr,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2460 s->dsp.put_h264_qpel_pixels_tab, s->dsp.put_h264_chroma_pixels_tab,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2461 s->dsp.avg_h264_qpel_pixels_tab, s->dsp.avg_h264_chroma_pixels_tab);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2462 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2463
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2464
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2465 if(!IS_INTRA4x4(mb_type)){
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2466 if(s->codec_id == CODEC_ID_H264){
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2467 for(i=0; i<16; i++){
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2468 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2469 uint8_t * const ptr= dest_y + h->block_offset[i];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2470 h264_add_idct_c(ptr, h->mb + i*16, linesize);
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2471 }
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2472 }
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2473 }else{
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2474 for(i=0; i<16; i++){
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2475 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2476 uint8_t * const ptr= dest_y + h->block_offset[i];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2477 svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, IS_INTRA(mb_type) ? 1 : 0);
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2478 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2479 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2480 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2481 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2482
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2483 if(!(s->flags&CODEC_FLAG_GRAY)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2484 chroma_dc_dequant_idct_c(h->mb + 16*16, h->chroma_qp);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2485 chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->chroma_qp);
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2486 if(s->codec_id == CODEC_ID_H264){
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2487 for(i=16; i<16+4; i++){
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2488 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2489 uint8_t * const ptr= dest_cb + h->block_offset[i];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2490 h264_add_idct_c(ptr, h->mb + i*16, uvlinesize);
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2491 }
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2492 }
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2493 for(i=20; i<20+4; i++){
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2494 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2495 uint8_t * const ptr= dest_cr + h->block_offset[i];
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2496 h264_add_idct_c(ptr, h->mb + i*16, uvlinesize);
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2497 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2498 }
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2499 }else{
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2500 for(i=16; i<16+4; i++){
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2501 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2502 uint8_t * const ptr= dest_cb + h->block_offset[i];
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
2503 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2);
1250
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2504 }
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2505 }
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2506 for(i=20; i<20+4; i++){
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2507 if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2508 uint8_t * const ptr= dest_cr + h->block_offset[i];
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2509 svq3_add_idct_c(ptr, h->mb + i*16, uvlinesize, chroma_qp[s->qscale + 12] - 12, 2);
fa181d095027 optimizations
michaelni
parents: 1234
diff changeset
2510 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2511 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2512 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2513 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2514 if(h->deblocking_filter) {
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2515 backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2516 filter_mb(h, mb_x, mb_y, dest_y, dest_cb, dest_cr);
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
2517 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2518 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2519
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2520 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2521 * fills the default_ref_list.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2522 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2523 static int fill_default_ref_list(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2524 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2525 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2526 Picture sorted_short_ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2527
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2528 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2529 int out_i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2530 int limit= -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2531
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2532 for(out_i=0; out_i<h->short_ref_count; out_i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2533 int best_i=-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2534 int best_poc=-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2535
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2536 for(i=0; i<h->short_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2537 const int poc= h->short_ref[i]->poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2538 if(poc > limit && poc < best_poc){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2539 best_poc= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2540 best_i= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2541 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2542 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2543
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2544 assert(best_i != -1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2545
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2546 limit= best_poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2547 sorted_short_ref[out_i]= *h->short_ref[best_i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2548 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2549 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2550
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2551 if(s->picture_structure == PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2552 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2553 const int current_poc= s->current_picture_ptr->poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2554 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2555
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2556 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2557 int index=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2558
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2559 for(i=0; i<h->short_ref_count && index < h->ref_count[list]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2560 const int i2= list ? h->short_ref_count - i - 1 : i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2561 const int poc= sorted_short_ref[i2].poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2562
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2563 if(sorted_short_ref[i2].reference != 3) continue; //FIXME refernce field shit
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2564
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2565 if((list==1 && poc > current_poc) || (list==0 && poc < current_poc)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2566 h->default_ref_list[list][index ]= sorted_short_ref[i2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2567 h->default_ref_list[list][index++].pic_id= sorted_short_ref[i2].frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2568 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2569 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2570
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2571 for(i=0; i<h->long_ref_count && index < h->ref_count[ list ]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2572 if(h->long_ref[i]->reference != 3) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2573
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2574 h->default_ref_list[ list ][index ]= *h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2575 h->default_ref_list[ list ][index++].pic_id= i;;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2576 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2577
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2578 if(h->long_ref_count > 1 && h->short_ref_count==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2579 Picture temp= h->default_ref_list[1][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2580 h->default_ref_list[1][0] = h->default_ref_list[1][1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2581 h->default_ref_list[1][0] = temp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2582 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2583
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2584 if(index < h->ref_count[ list ])
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2585 memset(&h->default_ref_list[list][index], 0, sizeof(Picture)*(h->ref_count[ list ] - index));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2586 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2587 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2588 int index=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2589 for(i=0; i<h->short_ref_count && index < h->ref_count[0]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2590 if(h->short_ref[i]->reference != 3) continue; //FIXME refernce field shit
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2591 h->default_ref_list[0][index ]= *h->short_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2592 h->default_ref_list[0][index++].pic_id= h->short_ref[i]->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2593 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2594 for(i=0; i<h->long_ref_count && index < h->ref_count[0]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2595 if(h->long_ref[i]->reference != 3) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2596 h->default_ref_list[0][index ]= *h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2597 h->default_ref_list[0][index++].pic_id= i;;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2598 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2599 if(index < h->ref_count[0])
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2600 memset(&h->default_ref_list[0][index], 0, sizeof(Picture)*(h->ref_count[0] - index));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2601 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2602 }else{ //FIELD
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2603 if(h->slice_type==B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2604 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2605 //FIXME second field balh
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2606 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2607 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2608 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2609 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2610
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2611 static int decode_ref_pic_list_reordering(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2612 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2613 int list;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2614
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2615 if(h->slice_type==I_TYPE || h->slice_type==SI_TYPE) return 0; //FIXME move beofre func
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2616
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2617 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2618 memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2619
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2620 if(get_bits1(&s->gb)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2621 int pred= h->curr_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2622 int index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2623
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2624 for(index=0; ; index++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2625 int reordering_of_pic_nums_idc= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2626 int pic_id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2627 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2628
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2629
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2630 if(index >= h->ref_count[list]){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2631 av_log(h->s.avctx, AV_LOG_ERROR, "reference count overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2632 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2633 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2634
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2635 if(reordering_of_pic_nums_idc<3){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2636 if(reordering_of_pic_nums_idc<2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2637 const int abs_diff_pic_num= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2638
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2639 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
2640 av_log(h->s.avctx, AV_LOG_ERROR, "abs_diff_pic_num overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2641 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2642 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2643
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2644 if(reordering_of_pic_nums_idc == 0) pred-= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2645 else pred+= abs_diff_pic_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2646 pred &= h->max_pic_num - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2647
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2648 for(i= h->ref_count[list]-1; i>=index; i--){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2649 if(h->ref_list[list][i].pic_id == pred && h->ref_list[list][i].long_ref==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2650 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2651 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2652 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2653 pic_id= get_ue_golomb(&s->gb); //long_term_pic_idx
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2654
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2655 for(i= h->ref_count[list]-1; i>=index; i--){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2656 if(h->ref_list[list][i].pic_id == pic_id && h->ref_list[list][i].long_ref==1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2657 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2658 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2659 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2660
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2661 if(i < index){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2662 av_log(h->s.avctx, AV_LOG_ERROR, "reference picture missing during reorder\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2663 memset(&h->ref_list[list][index], 0, sizeof(Picture)); //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2664 }else if(i > index){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2665 Picture tmp= h->ref_list[list][i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2666 for(; i>index; i--){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2667 h->ref_list[list][i]= h->ref_list[list][i-1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2668 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2669 h->ref_list[list][index]= tmp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2670 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2671 }else if(reordering_of_pic_nums_idc==3)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2672 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2673 else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2674 av_log(h->s.avctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2675 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2676 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2677 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2678 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2679
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2680 if(h->slice_type!=B_TYPE) break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2681 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2682 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2683 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2684
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2685 static int pred_weight_table(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2686 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2687 int list, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2688
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2689 h->luma_log2_weight_denom= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2690 h->chroma_log2_weight_denom= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2691
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2692 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2693 for(i=0; i<h->ref_count[list]; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2694 int luma_weight_flag, chroma_weight_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2695
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2696 luma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2697 if(luma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2698 h->luma_weight[list][i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2699 h->luma_offset[list][i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2700 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2701
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2702 chroma_weight_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2703 if(chroma_weight_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2704 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2705 for(j=0; j<2; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2706 h->chroma_weight[list][i][j]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2707 h->chroma_offset[list][i][j]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2708 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2709 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2710 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2711 if(h->slice_type != B_TYPE) break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2712 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2713 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2714 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2715
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2716 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2717 * instantaneos decoder refresh.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2718 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2719 static void idr(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2720 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2721
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2722 for(i=0; i<h->long_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2723 h->long_ref[i]->reference=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2724 h->long_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2725 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2726 h->long_ref_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2727
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2728 for(i=0; i<h->short_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2729 h->short_ref[i]->reference=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2730 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2731 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2732 h->short_ref_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2733 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2734
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2735 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2736 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2737 * @return the removed picture or NULL if an error occures
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2738 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2739 static Picture * remove_short(H264Context *h, int frame_num){
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2740 MpegEncContext * const s = &h->s;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2741 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2742
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2743 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
2744 av_log(h->s.avctx, AV_LOG_DEBUG, "remove short %d count %d\n", frame_num, h->short_ref_count);
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2745
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2746 for(i=0; i<h->short_ref_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2747 Picture *pic= h->short_ref[i];
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2748 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
2749 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
2750 if(pic->frame_num == frame_num){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2751 h->short_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2752 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
2753 h->short_ref_count--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2754 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2755 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2756 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2757 return NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2758 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2759
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2760 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2761 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2762 * @return the removed picture or NULL if an error occures
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2763 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2764 static Picture * remove_long(H264Context *h, int i){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2765 Picture *pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2766
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2767 if(i >= h->long_ref_count) return NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2768 pic= h->long_ref[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2769 if(pic==NULL) return NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2770
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2771 h->long_ref[i]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2772 memmove(&h->long_ref[i], &h->long_ref[i+1], (h->long_ref_count - i - 1)*sizeof(Picture*));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2773 h->long_ref_count--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2774
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2775 return pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2776 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2777
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2778 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2779 * Executes the reference picture marking (memory management control operations).
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2780 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2781 static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2782 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2783 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2784 int current_is_long=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2785 Picture *pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2786
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2787 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
2788 av_log(h->s.avctx, AV_LOG_DEBUG, "no mmco here\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2789
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2790 for(i=0; i<mmco_count; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2791 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
2792 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
2793
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2794 switch(mmco[i].opcode){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2795 case MMCO_SHORT2UNUSED:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2796 pic= remove_short(h, mmco[i].short_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2797 if(pic==NULL) return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2798 pic->reference= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2799 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2800 case MMCO_SHORT2LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2801 pic= remove_long(h, mmco[i].long_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2802 if(pic) pic->reference=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2803
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2804 h->long_ref[ mmco[i].long_index ]= remove_short(h, mmco[i].short_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2805 h->long_ref[ mmco[i].long_index ]->long_ref=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2806 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2807 case MMCO_LONG2UNUSED:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2808 pic= remove_long(h, mmco[i].long_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2809 if(pic==NULL) return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2810 pic->reference= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2811 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2812 case MMCO_LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2813 pic= remove_long(h, mmco[i].long_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2814 if(pic) pic->reference=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2815
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2816 h->long_ref[ mmco[i].long_index ]= s->current_picture_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2817 h->long_ref[ mmco[i].long_index ]->long_ref=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2818 h->long_ref_count++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2819
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2820 current_is_long=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2821 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2822 case MMCO_SET_MAX_LONG:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2823 assert(mmco[i].long_index <= 16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2824 while(mmco[i].long_index < h->long_ref_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2825 pic= remove_long(h, mmco[i].long_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2826 pic->reference=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2827 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2828 while(mmco[i].long_index > h->long_ref_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2829 h->long_ref[ h->long_ref_count++ ]= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2830 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2831 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2832 case MMCO_RESET:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2833 while(h->short_ref_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2834 pic= remove_short(h, h->short_ref[0]->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2835 pic->reference=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2836 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2837 while(h->long_ref_count){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2838 pic= remove_long(h, h->long_ref_count-1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2839 pic->reference=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2840 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2841 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2842 default: assert(0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2843 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2844 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2845
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2846 if(!current_is_long){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2847 pic= remove_short(h, s->current_picture_ptr->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2848 if(pic){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2849 pic->reference=0;
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2850 av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2851 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2852
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2853 if(h->short_ref_count)
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2854 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
2855
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
2856 h->short_ref[0]= s->current_picture_ptr;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2857 h->short_ref[0]->long_ref=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2858 h->short_ref_count++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2859 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2860
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2861 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2862 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2863
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2864 static int decode_ref_pic_marking(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2865 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2866 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2867
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2868 if(h->nal_unit_type == NAL_IDR_SLICE){ //FIXME fields
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2869 s->broken_link= get_bits1(&s->gb) -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2870 h->mmco[0].long_index= get_bits1(&s->gb) - 1; // current_long_term_idx
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2871 if(h->mmco[0].long_index == -1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2872 h->mmco_index= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2873 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2874 h->mmco[0].opcode= MMCO_LONG;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2875 h->mmco_index= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2876 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2877 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2878 if(get_bits1(&s->gb)){ // adaptive_ref_pic_marking_mode_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2879 for(i= h->mmco_index; i<MAX_MMCO_COUNT; i++) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2880 MMCOOpcode opcode= get_ue_golomb(&s->gb);;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2881
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2882 h->mmco[i].opcode= opcode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2883 if(opcode==MMCO_SHORT2UNUSED || opcode==MMCO_SHORT2LONG){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2884 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
2885 /* if(h->mmco[i].short_frame_num >= h->short_ref_count || h->short_ref[ h->mmco[i].short_frame_num ] == NULL){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2886 fprintf(stderr, "illegal short ref in memory management control operation %d\n", mmco);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2887 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2888 }*/
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2889 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2890 if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2891 h->mmco[i].long_index= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2892 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
2893 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
2894 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2895 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2896 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2897
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2898 if(opcode > MMCO_LONG){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
2899 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
2900 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2901 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2902 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2903 h->mmco_index= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2904 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2905 assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2906
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2907 if(h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count){ //FIXME fields
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2908 h->mmco[0].opcode= MMCO_SHORT2UNUSED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2909 h->mmco[0].short_frame_num= h->short_ref[ h->short_ref_count - 1 ]->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2910 h->mmco_index= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2911 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2912 h->mmco_index= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2913 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2914 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2915
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2916 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2917 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2918
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2919 static int init_poc(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2920 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2921 const int max_frame_num= 1<<h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2922 int field_poc[2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2923
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2924 if(h->nal_unit_type == NAL_IDR_SLICE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2925 h->frame_num_offset= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2926 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2927 if(h->frame_num < h->prev_frame_num)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2928 h->frame_num_offset= h->prev_frame_num_offset + max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2929 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2930 h->frame_num_offset= h->prev_frame_num_offset;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2931 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2932
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2933 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2934 const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2935
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2936 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
2937 h->poc_msb = h->prev_poc_msb + max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2938 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
2939 h->poc_msb = h->prev_poc_msb - max_poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2940 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2941 h->poc_msb = h->prev_poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2942 //printf("poc: %d %d\n", h->poc_msb, h->poc_lsb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2943 field_poc[0] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2944 field_poc[1] = h->poc_msb + h->poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2945 if(s->picture_structure == PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2946 field_poc[1] += h->delta_poc_bottom;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2947 }else if(h->sps.poc_type==1){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2948 int abs_frame_num, expected_delta_per_poc_cycle, expectedpoc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2949 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2950
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2951 if(h->sps.poc_cycle_length != 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2952 abs_frame_num = h->frame_num_offset + h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2953 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2954 abs_frame_num = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2955
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2956 if(h->nal_ref_idc==0 && abs_frame_num > 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2957 abs_frame_num--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2958
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2959 expected_delta_per_poc_cycle = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2960 for(i=0; i < h->sps.poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2961 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
2962
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2963 if(abs_frame_num > 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2964 int poc_cycle_cnt = (abs_frame_num - 1) / h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2965 int frame_num_in_poc_cycle = (abs_frame_num - 1) % h->sps.poc_cycle_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2966
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2967 expectedpoc = poc_cycle_cnt * expected_delta_per_poc_cycle;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2968 for(i = 0; i <= frame_num_in_poc_cycle; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2969 expectedpoc = expectedpoc + h->sps.offset_for_ref_frame[ i ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2970 } else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2971 expectedpoc = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2972
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2973 if(h->nal_ref_idc == 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2974 expectedpoc = expectedpoc + h->sps.offset_for_non_ref_pic;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2975
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2976 field_poc[0] = expectedpoc + h->delta_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2977 field_poc[1] = field_poc[0] + h->sps.offset_for_top_to_bottom_field;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2978
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2979 if(s->picture_structure == PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2980 field_poc[1] += h->delta_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2981 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2982 int poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2983 if(h->nal_unit_type == NAL_IDR_SLICE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2984 poc= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2985 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2986 if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2987 else poc= 2*(h->frame_num_offset + h->frame_num) - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2988 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2989 field_poc[0]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2990 field_poc[1]= poc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2991 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2992
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2993 if(s->picture_structure != PICT_BOTTOM_FIELD)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2994 s->current_picture_ptr->field_poc[0]= field_poc[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2995 if(s->picture_structure != PICT_TOP_FIELD)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2996 s->current_picture_ptr->field_poc[1]= field_poc[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2997 if(s->picture_structure == PICT_FRAME) // FIXME field pix?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2998 s->current_picture_ptr->poc= FFMIN(field_poc[0], field_poc[1]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
2999
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3000 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3001 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3002
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3003 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3004 * decodes a slice header.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3005 * this will allso call MPV_common_init() and frame_start() as needed
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3006 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3007 static int decode_slice_header(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3008 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3009 int first_mb_in_slice, pps_id;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3010 int num_ref_idx_active_override_flag;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3011 static const uint8_t slice_type_map[5]= {P_TYPE, B_TYPE, I_TYPE, SP_TYPE, SI_TYPE};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3012
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3013 s->current_picture.reference= h->nal_ref_idc != 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3014
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3015 first_mb_in_slice= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3016
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3017 h->slice_type= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3018 if(h->slice_type > 9){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3019 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);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3020 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3021 if(h->slice_type > 4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3022 h->slice_type -= 5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3023 h->slice_type_fixed=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3024 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3025 h->slice_type_fixed=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3026
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3027 h->slice_type= slice_type_map[ h->slice_type ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3028
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3029 s->pict_type= h->slice_type; // to make a few old func happy, its wrong though
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3030
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3031 pps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3032 if(pps_id>255){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3033 av_log(h->s.avctx, AV_LOG_ERROR, "pps_id out of range\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3034 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3035 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3036 h->pps= h->pps_buffer[pps_id];
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3037 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
3038 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
3039 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3040 }
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3041
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3042 h->sps= h->sps_buffer[ h->pps.sps_id ];
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3043 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
3044 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
3045 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
3046 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3047
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3048 s->mb_width= h->sps.mb_width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3049 s->mb_height= h->sps.mb_height;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3050
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3051 h->b_stride= s->mb_width*4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3052 h->b8_stride= s->mb_width*2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3053
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3054 s->mb_x = first_mb_in_slice % s->mb_width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3055 s->mb_y = first_mb_in_slice / s->mb_width; //FIXME AFFW
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3056
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
3057 s->width = 16*s->mb_width - 2*(h->sps.crop_left + h->sps.crop_right );
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3058 if(h->sps.frame_mbs_only_flag)
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
3059 s->height= 16*s->mb_height - 2*(h->sps.crop_top + h->sps.crop_bottom);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3060 else
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
3061 s->height= 16*s->mb_height - 4*(h->sps.crop_top + h->sps.crop_bottom); //FIXME recheck
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3062
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3063 if (s->context_initialized
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
3064 && ( s->width != s->avctx->width || s->height != s->avctx->height)) {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3065 free_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3066 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3067 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3068 if (!s->context_initialized) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3069 if (MPV_common_init(s) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3070 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3071
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3072 alloc_tables(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3073
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3074 s->avctx->width = s->width;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3075 s->avctx->height = s->height;
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
3076 s->avctx->sample_aspect_ratio= h->sps.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
3077
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
3078 if(h->sps.timing_info_present_flag && h->sps.fixed_frame_rate_flag){
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
3079 s->avctx->frame_rate = h->sps.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
3080 s->avctx->frame_rate_base = h->sps.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
3081 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3082 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3083
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3084 if(first_mb_in_slice == 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3085 frame_start(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3086 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3087
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3088 s->current_picture_ptr->frame_num= //FIXME frame_num cleanup
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3089 h->frame_num= get_bits(&s->gb, h->sps.log2_max_frame_num);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3090
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3091 if(h->sps.frame_mbs_only_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3092 s->picture_structure= PICT_FRAME;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3093 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3094 if(get_bits1(&s->gb)) //field_pic_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3095 s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3096 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3097 s->picture_structure= PICT_FRAME;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3098 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3099
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3100 if(s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3101 h->curr_pic_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3102 h->max_pic_num= 1<< h->sps.log2_max_frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3103 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3104 h->curr_pic_num= 2*h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3105 h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3106 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3107
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3108 if(h->nal_unit_type == NAL_IDR_SLICE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3109 get_ue_golomb(&s->gb); /* idr_pic_id */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3110 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3111
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3112 if(h->sps.poc_type==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3113 h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3114
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3115 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3116 h->delta_poc_bottom= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3117 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3118 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3119
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3120 if(h->sps.poc_type==1 && !h->sps.delta_pic_order_always_zero_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3121 h->delta_poc[0]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3122
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3123 if(h->pps.pic_order_present==1 && s->picture_structure==PICT_FRAME)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3124 h->delta_poc[1]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3125 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3126
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3127 init_poc(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3128
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3129 if(h->pps.redundant_pic_cnt_present){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3130 h->redundant_pic_count= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3131 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3132
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3133 //set defaults, might be overriden a few line later
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3134 h->ref_count[0]= h->pps.ref_count[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3135 h->ref_count[1]= h->pps.ref_count[1];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3136
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3137 if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3138 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3139 h->direct_spatial_mv_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3140 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3141 num_ref_idx_active_override_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3142
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3143 if(num_ref_idx_active_override_flag){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3144 h->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3145 if(h->slice_type==B_TYPE)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3146 h->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3147
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3148 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
3149 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3150 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3151 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3152 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3153 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3154
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3155 if(first_mb_in_slice == 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3156 fill_default_ref_list(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3157 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3158
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3159 decode_ref_pic_list_reordering(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3160
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3161 if( (h->pps.weighted_pred && (h->slice_type == P_TYPE || h->slice_type == SP_TYPE ))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3162 || (h->pps.weighted_bipred_idc==1 && h->slice_type==B_TYPE ) )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3163 pred_weight_table(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3164
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3165 if(s->current_picture.reference)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3166 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
3167
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3168 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
3169 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
3170
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3171 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
3172 s->qscale = h->pps.init_qp + get_se_golomb(&s->gb);
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3173 if(s->qscale<0 || s->qscale>51){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3174 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
3175 return -1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3176 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3177 //FIXME qscale / qp ... stuff
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3178 if(h->slice_type == SP_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3179 get_bits1(&s->gb); /* sp_for_switch_flag */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3180 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3181 if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){
1453
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3182 get_se_golomb(&s->gb); /* slice_qs_delta */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3183 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3184
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3185 h->deblocking_filter = 1;
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3186 h->slice_alpha_c0_offset = 0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
3187 h->slice_beta_offset = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3188 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
3189 h->deblocking_filter= get_ue_golomb(&s->gb);
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3190 if(h->deblocking_filter < 2)
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3191 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
3192
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3193 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
3194 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
3195 h->slice_beta_offset = get_se_golomb(&s->gb) << 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3196 }
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
3197 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3198
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3199 #if 0 //FMO
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3200 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
3201 slice_group_change_cycle= get_bits(&s->gb, ?);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3202 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3203
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3204 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3205 av_log(h->s.avctx, AV_LOG_DEBUG, "mb:%d %c pps:%d frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d\n",
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3206 first_mb_in_slice,
1264
2fa34e615c76 cleanup
michaelni
parents: 1252
diff changeset
3207 av_get_pict_type_char(h->slice_type),
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3208 pps_id, h->frame_num,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3209 s->current_picture_ptr->field_poc[0], s->current_picture_ptr->field_poc[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3210 h->ref_count[0], h->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3211 s->qscale,
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3212 h->deblocking_filter
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3213 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3214 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3215
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3216 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3217 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3218
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3219 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3220 *
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3221 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3222 static inline int get_level_prefix(GetBitContext *gb){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3223 unsigned int buf;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3224 int log;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3225
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3226 OPEN_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3227 UPDATE_CACHE(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3228 buf=GET_CACHE(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3229
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3230 log= 32 - av_log2(buf);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3231 #ifdef TRACE
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3232 print_bin(buf>>(32-log), log);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3233 printf("%5d %2d %3d lpr @%5d in %s get_level_prefix\n", buf>>(32-log), log, log-1, get_bits_count(gb), __FILE__);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3234 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3235
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3236 LAST_SKIP_BITS(re, gb, log);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3237 CLOSE_READER(re, gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3238
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3239 return log-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3240 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3241
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3242 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3243 * decodes a residual block.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3244 * @param n block index
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3245 * @param scantable scantable
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3246 * @param max_coeff number of coefficients in the block
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3247 * @return <0 if an error occured
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3248 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3249 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, int qp, int max_coeff){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3250 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3251 const uint16_t *qmul= dequant_coeff[qp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3252 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};
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3253 int level[16], run[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3254 int suffix_length, zeros_left, coeff_num, coeff_token, total_coeff, i, trailing_ones;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3255
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3256 //FIXME put trailing_onex into the context
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3257
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3258 if(n == CHROMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3259 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
3260 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3261 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3262 if(n == LUMA_DC_BLOCK_INDEX){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3263 total_coeff= pred_non_zero_count(h, 0);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3264 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
3265 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3266 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3267 total_coeff= pred_non_zero_count(h, n);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3268 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
3269 total_coeff= coeff_token>>2;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3270 h->non_zero_count_cache[ scan8[n] ]= total_coeff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3271 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3272 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3273
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3274 //FIXME set last_non_zero?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3275
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3276 if(total_coeff==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3277 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3278
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3279 trailing_ones= coeff_token&3;
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3280 tprintf("trailing:%d, total:%d\n", trailing_ones, total_coeff);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3281 assert(total_coeff<=16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3282
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3283 for(i=0; i<trailing_ones; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3284 level[i]= 1 - 2*get_bits1(gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3285 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3286
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3287 suffix_length= total_coeff > 10 && trailing_ones < 3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3288
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3289 for(; i<total_coeff; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3290 const int prefix= get_level_prefix(gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3291 int level_code, mask;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3292
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3293 if(prefix<14){ //FIXME try to build a large unified VLC table for all this
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3294 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3295 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3296 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3297 level_code= (prefix<<suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3298 }else if(prefix==14){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3299 if(suffix_length)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3300 level_code= (prefix<<suffix_length) + get_bits(gb, suffix_length); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3301 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3302 level_code= prefix + get_bits(gb, 4); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3303 }else if(prefix==15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3304 level_code= (prefix<<suffix_length) + get_bits(gb, 12); //part
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3305 if(suffix_length==0) level_code+=15; //FIXME doesnt make (much)sense
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3306 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3307 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
3308 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3309 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3310
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3311 if(i==trailing_ones && i<3) level_code+= 2; //FIXME split first iteration
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3312
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3313 mask= -(level_code&1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3314 level[i]= (((2+level_code)>>1) ^ mask) - mask;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3315
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3316 if(suffix_length==0) suffix_length=1; //FIXME split first iteration
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3317
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3318 #if 1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3319 if(ABS(level[i]) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3320 #else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3321 if((2+level_code)>>1) > (3<<(suffix_length-1)) && suffix_length<6) suffix_length++;
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
3322 /* ? == prefix > 2 or sth */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3323 #endif
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3324 tprintf("level: %d suffix_length:%d\n", level[i], suffix_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3325 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3326
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3327 if(total_coeff == max_coeff)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3328 zeros_left=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3329 else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3330 if(n == CHROMA_DC_BLOCK_INDEX)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3331 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
3332 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3333 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
3334 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3335
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3336 for(i=0; i<total_coeff-1; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3337 if(zeros_left <=0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3338 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3339 else if(zeros_left < 7){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3340 run[i]= get_vlc2(gb, run_vlc[zeros_left-1].table, RUN_VLC_BITS, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3341 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3342 run[i]= get_vlc2(gb, run7_vlc.table, RUN7_VLC_BITS, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3343 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3344 zeros_left -= run[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3345 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3346
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3347 if(zeros_left<0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3348 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
3349 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3350 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3351
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3352 for(; i<total_coeff-1; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3353 run[i]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3354 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3355
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3356 run[i]= zeros_left;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3357
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3358 coeff_num=-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3359 if(n > 24){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3360 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3361 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3362
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3363 coeff_num += run[i] + 1; //FIXME add 1 earlier ?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3364 j= scantable[ coeff_num ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3365
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3366 block[j]= level[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3367 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3368 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3369 for(i=total_coeff-1; i>=0; i--){ //FIXME merge into rundecode?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3370 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3371
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3372 coeff_num += run[i] + 1; //FIXME add 1 earlier ?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3373 j= scantable[ coeff_num ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3374
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3375 block[j]= level[i] * qmul[j];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3376 // printf("%d %d ", block[j], qmul[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3377 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3378 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3379 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3380 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3381
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3382 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3383 * decodes a macroblock
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3384 * @returns 0 if ok, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3385 */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3386 static int decode_mb_cavlc(H264Context *h){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3387 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
3388 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
3389 int mb_type, partition_count, cbp;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3390
1252
67ee8bab0f28 optimizations
michaelni
parents: 1250
diff changeset
3391 s->dsp.clear_blocks(h->mb); //FIXME avoid if allready clear (move after skip handlong?
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3392
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3393 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
3394 cbp = 0; /* avoid warning. FIXME: find a solution without slowing
20a79b0e6d2a removed warnings
bellard
parents: 1371
diff changeset
3395 down the code */
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3396 if(h->slice_type != I_TYPE && h->slice_type != SI_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3397 if(s->mb_skip_run==-1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3398 s->mb_skip_run= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3399
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3400 if (s->mb_skip_run--) {
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
3401 int mx, my;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3402 /* skip mb */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3403 //FIXME b frame
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3404 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3405
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3406 memset(h->non_zero_count[mb_xy], 0, 16);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3407 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3408
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3409 if(h->sps.mb_aff && s->mb_skip_run==0 && (s->mb_y&1)==0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3410 h->mb_field_decoding_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3411 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3412
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3413 if(h->mb_field_decoding_flag)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3414 mb_type|= MB_TYPE_INTERLACED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3415
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3416 fill_caches(h, mb_type); //FIXME check what is needed and what not ...
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3417 pred_pskip_motion(h, &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3418 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1);
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
3419 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3420 write_back_motion(h, mb_type);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3421
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3422 s->current_picture.mb_type[mb_xy]= mb_type; //FIXME SKIP type
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
3423 s->current_picture.qscale_table[mb_xy]= s->qscale;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3424 h->slice_table[ mb_xy ]= h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3425
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3426 h->prev_mb_skiped= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3427 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3428 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3429 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3430 if(h->sps.mb_aff /* && !field pic FIXME needed? */){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3431 if((s->mb_y&1)==0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3432 h->mb_field_decoding_flag = get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3433 }else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3434 h->mb_field_decoding_flag=0; //FIXME som ed note ?!
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3435
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3436 h->prev_mb_skiped= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3437
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3438 mb_type= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3439 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3440 if(mb_type < 23){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3441 partition_count= b_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3442 mb_type= b_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3443 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3444 mb_type -= 23;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3445 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3446 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3447 }else if(h->slice_type == P_TYPE /*|| h->slice_type == SP_TYPE */){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3448 if(mb_type < 5){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3449 partition_count= p_mb_type_info[mb_type].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3450 mb_type= p_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3451 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3452 mb_type -= 5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3453 goto decode_intra_mb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3454 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3455 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3456 assert(h->slice_type == I_TYPE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3457 decode_intra_mb:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3458 if(mb_type > 25){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3459 av_log(h->s.avctx, AV_LOG_ERROR, "mb_type %d in %c slice to large at %d %d\n", mb_type, av_get_pict_type_char(h->slice_type), s->mb_x, s->mb_y);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3460 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3461 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3462 partition_count=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3463 cbp= i_mb_type_info[mb_type].cbp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3464 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3465 mb_type= i_mb_type_info[mb_type].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3466 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3467
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3468 if(h->mb_field_decoding_flag)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3469 mb_type |= MB_TYPE_INTERLACED;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3470
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3471 s->current_picture.mb_type[mb_xy]= mb_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3472 h->slice_table[ mb_xy ]= h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3473
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3474 if(IS_INTRA_PCM(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3475 const uint8_t *ptr;
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
3476 int x, y;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3477
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3478 // we assume these blocks are very rare so we dont optimize it
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3479 align_get_bits(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3480
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3481 ptr= s->gb.buffer + get_bits_count(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3482
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3483 for(y=0; y<16; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3484 const int index= 4*(y&3) + 64*(y>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3485 for(x=0; x<16; x++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3486 h->mb[index + (x&3) + 16*(x>>2)]= *(ptr++);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3487 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3488 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3489 for(y=0; y<8; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3490 const int index= 256 + 4*(y&3) + 32*(y>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3491 for(x=0; x<8; x++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3492 h->mb[index + (x&3) + 16*(x>>2)]= *(ptr++);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3493 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3494 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3495 for(y=0; y<8; y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3496 const int index= 256 + 64 + 4*(y&3) + 32*(y>>2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3497 for(x=0; x<8; x++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3498 h->mb[index + (x&3) + 16*(x>>2)]= *(ptr++);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3499 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3500 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3501
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3502 skip_bits(&s->gb, 384); //FIXME check /fix the bitstream readers
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3503
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3504 //FIXME deblock filter, non_zero_count_cache init ...
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3505 memset(h->non_zero_count[mb_xy], 16, 16);
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
3506 s->current_picture.qscale_table[mb_xy]= s->qscale;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3507
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3508 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3509 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3510
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3511 fill_caches(h, mb_type);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3512
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3513 //mb_pred
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3514 if(IS_INTRA(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3515 // init_top_left_availability(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3516 if(IS_INTRA4x4(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3517 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3518
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3519 // fill_intra4x4_pred_table(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3520 for(i=0; i<16; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3521 const int mode_coded= !get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3522 const int predicted_mode= pred_intra_mode(h, i);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3523 int mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3524
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3525 if(mode_coded){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3526 const int rem_mode= get_bits(&s->gb, 3);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3527 if(rem_mode<predicted_mode)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3528 mode= rem_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3529 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3530 mode= rem_mode + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3531 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3532 mode= predicted_mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3533 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3534
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3535 h->intra4x4_pred_mode_cache[ scan8[i] ] = mode;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3536 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3537 write_back_intra_pred_mode(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3538 if( check_intra4x4_pred_mode(h) < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3539 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3540 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3541 h->intra16x16_pred_mode= check_intra_pred_mode(h, h->intra16x16_pred_mode);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3542 if(h->intra16x16_pred_mode < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3543 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3544 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3545 h->chroma_pred_mode= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3546
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3547 h->chroma_pred_mode= check_intra_pred_mode(h, h->chroma_pred_mode);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3548 if(h->chroma_pred_mode < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3549 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3550 }else if(partition_count==4){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3551 int i, j, sub_partition_count[4], list, ref[2][4];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3552
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3553 if(h->slice_type == B_TYPE){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3554 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3555 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3556 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
3557 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
3558 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3559 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3560 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3561 h->sub_mb_type[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3562 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3563 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3564 assert(h->slice_type == P_TYPE || h->slice_type == SP_TYPE); //FIXME SP correct ?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3565 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3566 h->sub_mb_type[i]= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3567 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
3568 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
3569 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3570 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3571 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3572 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3573 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3574 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3575
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3576 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3577 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3578 if(ref_count == 0) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3579 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3580 if(IS_DIR(h->sub_mb_type[i], 0, list) && !IS_DIRECT(h->sub_mb_type[i])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3581 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
3582 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3583 //FIXME
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3584 ref[list][i] = -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3585 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3586 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3587 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3588
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3589 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3590 const int ref_count= IS_REF0(mb_type) ? 1 : h->ref_count[list];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3591 if(ref_count == 0) continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3592
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3593 for(i=0; i<4; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3594 h->ref_cache[list][ scan8[4*i] ]=h->ref_cache[list][ scan8[4*i]+1 ]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3595 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
3596
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3597 if(IS_DIR(h->sub_mb_type[i], 0, list) && !IS_DIRECT(h->sub_mb_type[i])){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3598 const int sub_mb_type= h->sub_mb_type[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3599 const int block_width= (sub_mb_type & (MB_TYPE_16x16|MB_TYPE_16x8)) ? 2 : 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3600 for(j=0; j<sub_partition_count[i]; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3601 int mx, my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3602 const int index= 4*i + block_width*j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3603 int16_t (* mv_cache)[2]= &h->mv_cache[list][ scan8[index] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3604 pred_motion(h, index, block_width, list, h->ref_cache[list][ scan8[index] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3605 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3606 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3607 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3608
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3609 if(IS_SUB_8X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3610 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3611 mv_cache[ 8 ][0]= mv_cache[ 9 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3612 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3613 mv_cache[ 8 ][1]= mv_cache[ 9 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3614 }else if(IS_SUB_8X4(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3615 mv_cache[ 0 ][0]= mv_cache[ 1 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3616 mv_cache[ 0 ][1]= mv_cache[ 1 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3617 }else if(IS_SUB_4X8(sub_mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3618 mv_cache[ 0 ][0]= mv_cache[ 8 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3619 mv_cache[ 0 ][1]= mv_cache[ 8 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3620 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3621 assert(IS_SUB_4X4(sub_mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3622 mv_cache[ 0 ][0]= mx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3623 mv_cache[ 0 ][1]= my;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3624 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3625 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3626 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3627 uint32_t *p= (uint32_t *)&h->mv_cache[list][ scan8[4*i] ][0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3628 p[0] = p[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3629 p[8] = p[9]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3630 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3631 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3632 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3633 }else if(!IS_DIRECT(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3634 int list, mx, my, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3635 //FIXME we should set ref_idx_l? to 0 if we use that later ...
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3636 if(IS_16X16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3637 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3638 if(h->ref_count[0]>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3639 if(IS_DIR(mb_type, 0, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3640 const int val= get_te0_golomb(&s->gb, h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3641 fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3642 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3643 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3644 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3645 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3646 if(IS_DIR(mb_type, 0, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3647 pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3648 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3649 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3650 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3651
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
3652 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3653 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3654 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3655 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3656 else if(IS_16X8(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3657 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3658 if(h->ref_count[list]>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3659 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3660 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3661 const int val= get_te0_golomb(&s->gb, h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3662 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 8, val, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3663 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3664 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3665 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3666 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3667 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3668 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3669 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3670 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
3671 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3672 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3673 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3674
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
3675 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3676 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3677 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3678 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3679 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3680 assert(IS_8X16(mb_type));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3681 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3682 if(h->ref_count[list]>0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3683 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3684 if(IS_DIR(mb_type, i, list)){ //FIXME optimize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3685 const int val= get_te0_golomb(&s->gb, h->ref_count[list]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3686 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 4, 8, val, 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3687 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3688 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3689 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3690 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3691 for(list=0; list<2; list++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3692 for(i=0; i<2; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3693 if(IS_DIR(mb_type, i, list)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3694 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
3695 mx += get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3696 my += get_se_golomb(&s->gb);
1170
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3697 tprintf("final mv:%d %d\n", mx, my);
4710976004a5 #ifdef TRACE printf() -> tprintf()
michaelni
parents: 1169
diff changeset
3698
1269
2498a7045b37 bigendian fix
michaelni
parents: 1266
diff changeset
3699 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3700 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3701 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3702 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3703 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3704 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3705
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3706 if(IS_INTER(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3707 write_back_motion(h, mb_type);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3708
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3709 if(!IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3710 cbp= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3711 if(cbp > 47){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3712 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
3713 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3714 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3715
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3716 if(IS_INTRA4x4(mb_type))
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3717 cbp= golomb_to_intra4x4_cbp[cbp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3718 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3719 cbp= golomb_to_inter_cbp[cbp];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3720 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3721
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3722 if(cbp || IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3723 int i8x8, i4x4, chroma_idx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3724 int chroma_qp, dquant;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3725 GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3726 const uint8_t *scan, *dc_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3727
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3728 // fill_non_zero_count_cache(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3729
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3730 if(IS_INTERLACED(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3731 scan= field_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3732 dc_scan= luma_dc_field_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3733 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3734 scan= zigzag_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3735 dc_scan= luma_dc_zigzag_scan;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3736 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3737
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3738 dquant= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3739
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3740 if( dquant > 25 || dquant < -26 ){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
3741 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
3742 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3743 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3744
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3745 s->qscale += dquant;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3746 if(((unsigned)s->qscale) > 51){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3747 if(s->qscale<0) s->qscale+= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3748 else s->qscale-= 52;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3749 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3750
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3751 h->chroma_qp= chroma_qp= get_chroma_qp(h, s->qscale);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3752 if(IS_INTRA16x16(mb_type)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3753 if( decode_residual(h, h->intra_gb_ptr, h->mb, LUMA_DC_BLOCK_INDEX, dc_scan, s->qscale, 16) < 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3754 return -1; //FIXME continue if partotioned and other retirn -1 too
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3755 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3756
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3757 assert((cbp&15) == 0 || (cbp&15) == 15);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3758
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3759 if(cbp&15){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3760 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3761 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3762 const int index= i4x4 + 4*i8x8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3763 if( decode_residual(h, h->intra_gb_ptr, h->mb + 16*index, index, scan + 1, s->qscale, 15) < 0 ){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3764 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3765 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3766 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3767 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3768 }else{
1636
d9d98cdcfcde intra16x16 fix
michael
parents: 1598
diff changeset
3769 fill_rectangle(&h->non_zero_count_cache[scan8[0]], 4, 4, 8, 0, 1);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3770 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3771 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3772 for(i8x8=0; i8x8<4; i8x8++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3773 if(cbp & (1<<i8x8)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3774 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3775 const int index= i4x4 + 4*i8x8;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3776
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3777 if( decode_residual(h, gb, h->mb + 16*index, index, scan, s->qscale, 16) <0 ){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3778 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3779 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3780 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3781 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3782 uint8_t * const nnz= &h->non_zero_count_cache[ scan8[4*i8x8] ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3783 nnz[0] = nnz[1] = nnz[8] = nnz[9] = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3784 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3785 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3786 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3787
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3788 if(cbp&0x30){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3789 for(chroma_idx=0; chroma_idx<2; chroma_idx++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3790 if( decode_residual(h, gb, h->mb + 256 + 16*4*chroma_idx, CHROMA_DC_BLOCK_INDEX, chroma_dc_scan, chroma_qp, 4) < 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3791 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3792 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3793 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3794
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3795 if(cbp&0x20){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3796 for(chroma_idx=0; chroma_idx<2; chroma_idx++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3797 for(i4x4=0; i4x4<4; i4x4++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3798 const int index= 16 + 4*chroma_idx + i4x4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3799 if( decode_residual(h, gb, h->mb + 16*index, index, scan + 1, chroma_qp, 15) < 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3800 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3801 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3802 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3803 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3804 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3805 uint8_t * const nnz= &h->non_zero_count_cache[0];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3806 nnz[ scan8[16]+0 ] = nnz[ scan8[16]+1 ] =nnz[ scan8[16]+8 ] =nnz[ scan8[16]+9 ] =
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3807 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
3808 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3809 }else{
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
3810 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
3811 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
3812 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
3813 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
3814 }
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
3815 s->current_picture.qscale_table[mb_xy]= s->qscale;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3816 write_back_non_zero_count(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3817
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3818 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3819 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
3820
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3821 static int decode_cabac_mb_type( 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
3822 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
3823
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3824 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
3825 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
3826 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
3827 int 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
3828
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3829 if( s->mb_x > 0 && !IS_INTRA4x4( s->current_picture.mb_type[mb_xy-1] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3830 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3831 if( s->mb_y > 0 && !IS_INTRA4x4( s->current_picture.mb_type[mb_xy-s->mb_stride] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3832 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3833
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3834 if( get_cabac( &h->cabac, &h->cabac_state[3+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
3835 return 0; /* I4x4 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3836
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3837 if( get_cabac_terminate( &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
3838 return 25; /* PCM */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3839
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3840 mb_type = 1; /* I16x16 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3841 if( get_cabac( &h->cabac, &h->cabac_state[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
3842 mb_type += 12; /* cbp_luma != 0 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3843
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3844 if( get_cabac( &h->cabac, &h->cabac_state[3+4] ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3845 if( get_cabac( &h->cabac, &h->cabac_state[3+5] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3846 mb_type += 4 * 2; /* cbp_chroma == 2 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3847 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3848 mb_type += 4 * 1; /* cbp_chroma == 1 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3849 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3850 if( get_cabac( &h->cabac, &h->cabac_state[3+6] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3851 mb_type += 2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3852 if( get_cabac( &h->cabac, &h->cabac_state[3+7] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3853 mb_type += 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3854 return 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
3855
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3856 } else if( h->slice_type == P_TYPE ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3857 if( get_cabac( &h->cabac, &h->cabac_state[14] ) == 0 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3858 /* P-type */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3859 if( get_cabac( &h->cabac, &h->cabac_state[15] ) == 0 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3860 if( get_cabac( &h->cabac, &h->cabac_state[16] ) == 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3861 return 0; /* P_L0_D16x16; */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3862 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3863 return 3; /* P_8x8; */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3864 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3865 if( get_cabac( &h->cabac, &h->cabac_state[17] ) == 0 )
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
3866 return 2; /* P_L0_D8x16; */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3867 else
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
3868 return 1; /* P_L0_D16x8; */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3869 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3870 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3871 int 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
3872 /* 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
3873 if( get_cabac( &h->cabac, &h->cabac_state[17] ) == 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3874 return 5+0; /* I_4x4 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3875 if( get_cabac_terminate( &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
3876 return 5+25; /*I_PCM */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3877 mb_type = 5+1; /* I16x16 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3878 if( get_cabac( &h->cabac, &h->cabac_state[17+1] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3879 mb_type += 12; /* cbp_luma != 0 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3880
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3881 if( get_cabac( &h->cabac, &h->cabac_state[17+2] ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3882 if( get_cabac( &h->cabac, &h->cabac_state[17+2] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3883 mb_type += 4 * 2; /* cbp_chroma == 2 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3884 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3885 mb_type += 4 * 1; /* cbp_chroma == 1 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3886 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3887 if( get_cabac( &h->cabac, &h->cabac_state[17+3] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3888 mb_type += 2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3889 if( get_cabac( &h->cabac, &h->cabac_state[17+3] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3890 mb_type += 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3891
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3892 return 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
3893 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3894 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3895 /* TODO do others frames types */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3896 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
3897 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3898 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3899
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3900 static int decode_cabac_mb_skip( H264Context *h) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3901 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
3902 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
3903 const int mba_xy = mb_xy - 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3904 const int mbb_xy = mb_xy - s->mb_stride;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3905 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
3906
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3907 if( s->mb_x > 0 && !IS_SKIP( s->current_picture.mb_type[mba_xy] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3908 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3909 if( s->mb_y > 0 && !IS_SKIP( s->current_picture.mb_type[mbb_xy] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3910 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3911
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3912 if( h->slice_type == P_TYPE || h->slice_type == SP_TYPE)
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3913 return get_cabac( &h->cabac, &h->cabac_state[11+ctx] );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3914 else /* B-frame */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3915 return get_cabac( &h->cabac, &h->cabac_state[24+ctx] );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3916 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3917
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3918 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
3919 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
3920
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3921 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
3922 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
3923
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3924 if( get_cabac( &h->cabac, &h->cabac_state[69] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3925 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
3926 if( get_cabac( &h->cabac, &h->cabac_state[69] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3927 mode += 2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3928 if( get_cabac( &h->cabac, &h->cabac_state[69] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3929 mode += 4;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3930 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
3931 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
3932 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3933 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
3934 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3935
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3936 static int decode_cabac_mb_chroma_pre_mode( H264Context *h) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3937 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
3938 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
3939 const int mba_xy = mb_xy - 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3940 const int mbb_xy = mb_xy - s->mb_stride;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3941
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3942 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
3943
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
3944 /* No need to test for IS_INTRA4x4 and IS_INTRA16x16, as we set chroma_pred_mode_table to 0 */
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
3945 if( s->mb_x > 0 && 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
3946 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
3947
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
3948 if( s->mb_y > 0 && 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
3949 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3950
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3951 if( get_cabac( &h->cabac, &h->cabac_state[64+ctx] ) == 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3952 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
3953
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3954 if( get_cabac( &h->cabac, &h->cabac_state[64+3] ) == 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3955 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
3956 if( get_cabac( &h->cabac, &h->cabac_state[64+3] ) == 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3957 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
3958 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3959 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
3960 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3961
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3962 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
3963 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
3964 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3965 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
3966 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
3967 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3968 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
3969 { 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
3970 { 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
3971 { 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
3972 { 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
3973 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3974
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3975 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
3976 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
3977 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
3978
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3979 int cbp = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3980 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
3981
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3982 h->cbp_table[mb_xy] = 0; /* FIXME aaahahahah beurk */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3983
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3984 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
3985 int mba_xy = -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3986 int mbb_xy = -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3987 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
3988 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
3989
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3990 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
3991 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
3992
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3993 if( x > 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3994 mba_xy = 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
3995 else 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
3996 mba_xy = mb_xy - 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3997
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3998 if( y > 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
3999 mbb_xy = 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
4000 else if( s->mb_y > 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4001 mbb_xy = mb_xy - s->mb_stride;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4002
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
4003 /* No need to test for skip as we put 0 for skip block */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4004 if( mba_xy >= 0 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4005 int i8x8a = block_idx_xy[(x-1)&0x03][y]/4;
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
4006 if( ((h->cbp_table[mba_xy] >> i8x8a)&0x01) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4007 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4008 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4009
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4010 if( mbb_xy >= 0 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4011 int i8x8b = block_idx_xy[x][(y-1)&0x03]/4;
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
4012 if( ((h->cbp_table[mbb_xy] >> i8x8b)&0x01) == 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4013 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
4014 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4015
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4016 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
4017 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
4018 h->cbp_table[mb_xy] = cbp; /* FIXME aaahahahah beurk */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4019 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4020 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4021 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
4022 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4023 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
4024 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
4025 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
4026 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
4027 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
4028
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
4029 /* No need to test for skip */
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
4030 if( s->mb_x > 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4031 cbp_a = (h->cbp_table[mb_xy-1]>>4)&0x03;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4032 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4033 cbp_a = -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4034
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
4035 if( s->mb_y > 0 )
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4036 cbp_b = (h->cbp_table[mb_xy-s->mb_stride]>>4)&0x03;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4037 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4038 cbp_b = -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4039
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4040 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
4041 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
4042 if( cbp_b > 0 ) ctx += 2;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4043 if( get_cabac( &h->cabac, &h->cabac_state[77 + ctx] ) == 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4044 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
4045
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4046 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
4047 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
4048 if( cbp_b == 2 ) 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
4049 if( get_cabac( &h->cabac, &h->cabac_state[77 + ctx] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4050 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
4051 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4052 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
4053 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4054 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
4055 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
4056 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
4057 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
4058 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
4059
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4060 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
4061 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
4062 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4063 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
4064
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4065 if( mbn_xy >= 0 && h->last_qscale_diff != 0 && ( IS_INTRA16x16(s->current_picture.mb_type[mbn_xy] ) || (h->cbp_table[mbn_xy]&0x3f) ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4066 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4067
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4068 while( get_cabac( &h->cabac, &h->cabac_state[60 + ctx] ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4069 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
4070 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
4071 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4072 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
4073 val++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4074 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4075
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4076 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
4077 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
4078 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4079 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
4080 }
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4081 static int decode_cabac_mb_sub_type( H264Context *h ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4082 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
4083 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
4084 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
4085 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
4086 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
4087 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
4088 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
4089 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4090
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4091 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
4092 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
4093 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
4094 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
4095 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
4096
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4097 if( refa > 0 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4098 ctx++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4099 if( refb > 0 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4100 ctx += 2;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4101
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4102 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
4103 ref++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4104 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
4105 ctx = 4;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4106 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4107 ctx = 5;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4108 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4109 return ref;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4110 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4111
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4112 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
4113 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
4114 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
4115 int ctxbase = (l == 0) ? 40 : 47;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4116 int ctx;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4117 int mvd = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4118
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4119 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
4120 ctx = 0;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4121 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
4122 ctx = 2;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4123 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4124 ctx = 1;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4125
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4126 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
4127 mvd++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4128 if( ctx < 3 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4129 ctx = 3;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4130 else if( ctx < 6 )
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4131 ctx++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4132 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4133
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4134 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
4135 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
4136 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
4137 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
4138 k++;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4139 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4140 while( k-- ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4141 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
4142 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
4143 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4144 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4145 if( mvd != 0 && 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
4146 return -mvd;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4147 return mvd;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4148 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4149
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4150
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4151 static int get_cabac_cbf_ctx( H264Context *h, int cat, int idx ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4152 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
4153 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
4154 int mba_xy = -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4155 int mbb_xy = -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4156
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4157 int nza = -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4158 int nzb = -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4159 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
4160
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4161 if( cat == 0 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4162 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
4163 mba_xy = mb_xy - 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4164 if( IS_INTRA16x16(s->current_picture.mb_type[mba_xy] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4165 nza = h->cbp_table[mba_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
4166 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4167 if( s->mb_y > 0 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4168 mbb_xy = mb_xy - s->mb_stride;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4169 if( IS_INTRA16x16(s->current_picture.mb_type[mbb_xy] ) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4170 nzb = h->cbp_table[mbb_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
4171 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4172 } 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
4173 int i8x8a, i8x8b;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4174 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
4175
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4176 x = block_idx_x[idx];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4177 y = block_idx_y[idx];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4178
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4179 if( x > 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4180 mba_xy = 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
4181 else 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
4182 mba_xy = mb_xy - 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4183
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4184 if( y > 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4185 mbb_xy = 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
4186 else if( s->mb_y > 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4187 mbb_xy = mb_xy - s->mb_stride;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4188
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
4189 /* No need to test for skip */
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4190 if( mba_xy >= 0 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4191 i8x8a = block_idx_xy[(x-1)&0x03][y]/4;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4192
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
4193 if( !IS_INTRA_PCM(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
4194 ((h->cbp_table[mba_xy]&0x0f)>>i8x8a))
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4195 nza = h->non_zero_count_cache[scan8[idx] - 1];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4196 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4197
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4198 if( mbb_xy >= 0 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4199 i8x8b = block_idx_xy[x][(y-1)&0x03]/4;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4200
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
4201 if( !IS_INTRA_PCM(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
4202 ((h->cbp_table[mbb_xy]&0x0f)>>i8x8b))
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4203 nzb = h->non_zero_count_cache[scan8[idx] - 8];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4204 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4205 } else if( cat == 3 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4206 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
4207 mba_xy = mb_xy - 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4208
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
4209 if( !IS_INTRA_PCM(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
4210 (h->cbp_table[mba_xy]&0x30) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4211 nza = (h->cbp_table[mba_xy]>>(6+idx))&0x01;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4212 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4213 if( s->mb_y > 0 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4214 mbb_xy = mb_xy - s->mb_stride;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4215
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
4216 if( !IS_INTRA_PCM(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
4217 (h->cbp_table[mbb_xy]&0x30) )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4218 nzb = (h->cbp_table[mbb_xy]>>(6+idx))&0x01;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4219 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4220 } else if( cat == 4 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4221 int idxc = idx % 4 ;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4222 if( idxc == 1 || idxc == 3 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4223 mba_xy = 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
4224 else 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
4225 mba_xy = mb_xy -1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4226
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4227 if( idxc == 2 || idxc == 3 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4228 mbb_xy = 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
4229 else if( s->mb_y > 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4230 mbb_xy = mb_xy - s->mb_stride;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4231
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4232 if( mba_xy >= 0 &&
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4233 !IS_INTRA_PCM(s->current_picture.mb_type[mba_xy] ) &&
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4234 (h->cbp_table[mba_xy]&0x30) == 0x20 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4235 nza = h->non_zero_count_cache[scan8[16+idx] - 1];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4236
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4237 if( mbb_xy >= 0 &&
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4238 !IS_INTRA_PCM(s->current_picture.mb_type[mbb_xy] ) &&
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4239 (h->cbp_table[mbb_xy]&0x30) == 0x20 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4240 nzb = h->non_zero_count_cache[scan8[16+idx] - 8];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4241 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4242
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4243 if( ( mba_xy < 0 && IS_INTRA( s->current_picture.mb_type[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
4244 ( mba_xy >= 0 && IS_INTRA_PCM(s->current_picture.mb_type[mba_xy] ) ) ||
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4245 nza > 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4246 ctx++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4247
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4248 if( ( mbb_xy < 0 && IS_INTRA( s->current_picture.mb_type[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
4249 ( mbb_xy >= 0 && IS_INTRA_PCM(s->current_picture.mb_type[mbb_xy] ) ) ||
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4250 nzb > 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4251 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
4252
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4253 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
4254 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4255
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4256 static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, int qp, int max_coeff) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4257 const int mb_xy = h->s.mb_x + h->s.mb_y*h->s.mb_stride;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4258 const uint16_t *qmul= dequant_coeff[qp];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4259 static const int significant_coeff_flag_offset[5] = { 0, 15, 29, 44, 47 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4260 static const int last_significant_coeff_flag_offset[5] = { 0, 15, 29, 44, 47 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4261 static const int coeff_abs_level_m1_offset[5] = { 0, 10, 20, 30, 39 };
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4262
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4263 int coeff[16];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4264
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4265 int last = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4266 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
4267 int nz[16] = {0};
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4268 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
4269
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4270 int abslevel1 = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4271 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
4272
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4273 /* 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
4274 * 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
4275 * 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
4276 * 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
4277 * 4-> AC Chroma n = 4 * iCbCr + chroma4x4idx
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4278 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4279
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4280 /* read coded block flag */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4281 if( get_cabac( &h->cabac, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n ) ] ) == 0 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4282 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
4283 h->non_zero_count_cache[scan8[n]] = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4284 else if( cat == 4 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4285 h->non_zero_count_cache[scan8[16+n]] = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4286
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4287 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
4288 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4289
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4290 while( last < max_coeff - 1 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4291 int ctx = FFMIN( last, max_coeff - 2 );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4292
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4293 if( get_cabac( &h->cabac, &h->cabac_state[105+significant_coeff_flag_offset[cat]+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
4294 nz[last++] = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4295 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4296 else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4297 nz[last++] = 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4298 coeff_count++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4299 if( get_cabac( &h->cabac, &h->cabac_state[166+last_significant_coeff_flag_offset[cat]+ctx] ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4300 while( last < max_coeff ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4301 nz[last++] = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4302 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4303 break;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4304 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4305 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4306 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4307 if( last == max_coeff -1 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4308 nz[last++] = 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4309 coeff_count++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4310 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4311
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4312 if( cat == 0 && 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
4313 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
4314 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
4315 h->non_zero_count_cache[scan8[n]] = coeff_count;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4316 else if( cat == 3 && 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
4317 h->cbp_table[mb_xy] |= 0x40 << n;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4318 else if( cat == 4 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4319 h->non_zero_count_cache[scan8[16+n]] = coeff_count;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4320
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4321 for( i = coeff_count - 1; i >= 0; i-- ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4322 int coeff_abs_m1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4323
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4324 int ctx = (abslevelgt1 != 0 ? 0 : FFMIN( 4, abslevel1 + 1 )) + coeff_abs_level_m1_offset[cat];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4325
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4326 if( get_cabac( &h->cabac, &h->cabac_state[227+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
4327 coeff_abs_m1 = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4328 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4329 coeff_abs_m1 = 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4330 ctx = 5 + FFMIN( 4, abslevelgt1 ) + coeff_abs_level_m1_offset[cat];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4331 while( coeff_abs_m1 < 14 && get_cabac( &h->cabac, &h->cabac_state[227+ctx] ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4332 coeff_abs_m1++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4333 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4334 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4335
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4336 if( coeff_abs_m1 >= 14 ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4337 int j = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4338 while( get_cabac_bypass( &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
4339 coeff_abs_m1 += 1 << j;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4340 j++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4341 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4342
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4343 while( j-- ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4344 if( get_cabac_bypass( &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
4345 coeff_abs_m1 += 1 << j ;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4346 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4347 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4348 if( get_cabac_bypass( &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
4349 coeff[i] = -1 *( coeff_abs_m1 + 1 );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4350 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4351 coeff[i] = coeff_abs_m1 + 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4352
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4353 if( coeff_abs_m1 == 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4354 abslevel1++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4355 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4356 abslevelgt1++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4357 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4358
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4359 if( cat == 0 || cat == 3 ) { /* DC */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4360 int j;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4361 for( i = 0, j = 0; j < coeff_count; i++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4362 if( nz[i] ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4363 block[scantable[i]] = coeff[j];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4364
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4365 j++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4366 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4367 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4368
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4369 } else { /* AC */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4370 int j;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4371 for( i = 0, j = 0; j < coeff_count; i++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4372 if( nz[i] ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4373 block[scantable[i]] = coeff[j] * qmul[scantable[i]];
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4374
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4375 j++;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4376 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4377 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4378 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4379 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
4380 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4381
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4382 /**
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4383 * 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
4384 * @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
4385 */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4386 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
4387 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
4388 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
4389 int mb_type, partition_count, cbp = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4390
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4391 s->dsp.clear_blocks(h->mb); //FIXME avoid if allready clear (move after skip handlong?)
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4392
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4393 if( h->slice_type == B_TYPE ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4394 av_log( h->s.avctx, AV_LOG_ERROR, "B-frame not supported with CABAC\n" );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4395 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
4396 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4397 if( h->sps.mb_aff ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4398 av_log( h->s.avctx, AV_LOG_ERROR, "Fields not supported with CABAC\n" );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4399 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
4400 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4401
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4402 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4403 /* read skip flags */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4404 if( decode_cabac_mb_skip( h ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4405 int mx, my;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4406
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4407 /* skip mb */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4408 mb_type= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4409
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4410 memset(h->non_zero_count[mb_xy], 0, 16);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4411 memset(h->non_zero_count_cache + 8, 0, 8*5); //FIXME ugly, remove pfui
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4412 #if 0
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4413 if(h->sps.mb_aff && s->mb_skip_run==0 && (s->mb_y&1)==0){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4414 h->mb_field_decoding_flag= get_bits1(&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
4415 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4416 if(h->mb_field_decoding_flag)
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4417 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
4418 #endif
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4419
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4420 fill_caches(h, mb_type); //FIXME check what is needed and what not ...
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4421 pred_pskip_motion(h, &mx, &my);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4422 fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1);
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4423 fill_rectangle( h->mvd_cache[0][scan8[0]], 4, 4, 8, pack16to32(0,0), 4);
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4424 fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4425 write_back_motion(h, 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
4426
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4427 s->current_picture.mb_type[mb_xy]= mb_type; //FIXME SKIP type
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4428 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
4429 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
4430 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
4431 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
4432 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
4433
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4434 h->prev_mb_skiped= 1;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4435
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4436 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
4437
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4438 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4439 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4440 h->prev_mb_skiped = 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4441
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4442 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
4443 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
4444 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
4445 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4446
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4447 if( h->slice_type == P_TYPE ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4448 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
4449 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
4450 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
4451 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4452 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
4453 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
4454 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4455 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4456 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
4457 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
4458 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
4459 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
4460 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
4461 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
4462 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4463 #if 0
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4464 if(h->mb_field_decoding_flag)
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4465 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
4466 #endif
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4467
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4468 s->current_picture.mb_type[mb_xy]= mb_type;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4469 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
4470
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4471 if(IS_INTRA_PCM(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
4472 /* TODO */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4473 h->cbp_table[mb_xy] = 0xf +4*2;
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
4474 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
4475 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
4476 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
4477 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4478
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4479 fill_caches(h, 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
4480
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4481 if( IS_INTRA( mb_type ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4482 if( IS_INTRA4x4( mb_type ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4483 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
4484 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
4485 int pred = pred_intra_mode( h, i );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4486 h->intra4x4_pred_mode_cache[ scan8[i] ] = decode_cabac_mb_intra4x4_pred_mode( h, pred );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4487
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4488 //av_log( s->avctx, AV_LOG_ERROR, "i4x4 pred=%d mode=%d\n", pred, h->intra4x4_pred_mode_cache[ scan8[i] ] );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4489 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4490 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
4491 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
4492 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4493 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
4494 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
4495 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4496 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
4497 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
4498
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4499 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
4500 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
4501 } 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
4502 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
4503
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4504 /* Only P-frame */
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4505 for( i = 0; i < 4; i++ ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4506 h->sub_mb_type[i] = decode_cabac_mb_sub_type( h );
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4507 sub_partition_count[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4508 h->sub_mb_type[i]= p_sub_mb_type_info[ h->sub_mb_type[i] ].type;
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4509 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4510
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4511 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
4512 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
4513 for( i = 0; i < 4; i++ ) {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4514 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
4515 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
4516 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
4517 else
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4518 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
4519 } else {
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4520 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
4521 }
2110
michael
parents: 2099
diff changeset
4522 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
4523 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
4524 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4525 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4526 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4527
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4528 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
4529 for(i=0; i<4; i++){
2110
michael
parents: 2099
diff changeset
4530 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
4531
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4532 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
4533 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
4534 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
4535 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
4536 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
4537 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
4538 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
4539 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
4540 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
4541 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
4542
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4543 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
4544 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
4545 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
4546
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4547 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
4548 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
4549 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
4550 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
4551 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
4552
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4553 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
4554 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
4555 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
4556 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
4557 }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
4558 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
4559 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
4560
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4561 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
4562 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
4563 }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
4564 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
4565 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
4566
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4567 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
4568 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
4569 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4570 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
4571 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
4572 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
4573
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4574 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
4575 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
4576 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4577 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4578 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4579 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
4580 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
4581 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
4582 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
4583 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4584 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4585 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4586 } else if( !IS_DIRECT(mb_type) ) {
1935
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4587 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
4588 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
4589 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
4590 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
4591 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
4592 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
4593 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
4594 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4595 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4596 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4597 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
4598 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
4599 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
4600
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4601 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
4602 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
4603 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
4604
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4605 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
4606 fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4607 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4608 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4609 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4610 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
4611 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
4612 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
4613 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
4614 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
4615 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
4616 fill_rectangle(&h->ref_cache[list][ scan8[0] + 16*i ], 4, 2, 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
4617 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4618 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4619 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4620 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4621 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
4622 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
4623 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
4624 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
4625 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
4626 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
4627 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
4628
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4629 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
4630 fill_rectangle(h->mv_cache[list][ scan8[0] + 16*i ], 4, 2, 8, pack16to32(mx,my), 4);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4631 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4632 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4633 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4634 }else{
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4635 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
4636 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
4637 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
4638 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
4639 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
4640 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
4641 fill_rectangle(&h->ref_cache[list][ scan8[0] + 2*i ], 2, 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
4642 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4643 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4644 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4645 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4646 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
4647 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
4648 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
4649 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
4650 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
4651 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
4652
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4653 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
4654 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
4655 fill_rectangle(h->mv_cache[list][ scan8[0] + 2*i ], 2, 4, 8, pack16to32(mx,my), 4);
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4656 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4657 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4658 }
e935af90767b progressive P frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1909
diff changeset
4659 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4660 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4661
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
4662 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
4663 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
4664 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
4665 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4666
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4667 if( !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
4668 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
4669 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
4670 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4671
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4672 h->cbp_table[mb_xy] = cbp;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4673
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4674 if( cbp || IS_INTRA16x16( mb_type ) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4675 const uint8_t *scan, *dc_scan;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4676 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
4677
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4678 if(IS_INTERLACED(mb_type)){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4679 scan= field_scan;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4680 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
4681 }else{
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4682 scan= zigzag_scan;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4683 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
4684 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4685
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4686 h->last_qscale_diff = dqp = decode_cabac_mb_dqp( h );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4687 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
4688 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
4689 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
4690 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
4691 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4692 h->chroma_qp = get_chroma_qp(h, s->qscale);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4693
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4694 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
4695 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
4696 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4697 if( decode_cabac_residual( h, h->mb, 0, 0, dc_scan, s->qscale, 16) < 0)
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4698 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
4699 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
4700 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
4701 //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 AC:%d\n", i );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4702 if( decode_cabac_residual(h, h->mb + 16*i, 1, i, scan + 1, s->qscale, 15) < 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4703 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
4704 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4705 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4706 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
4707 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4708 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4709 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
4710 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
4711 if( cbp & (1<<i8x8) ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4712 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
4713 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
4714 //av_log( s->avctx, AV_LOG_ERROR, "Luma4x4: %d\n", index );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4715 if( decode_cabac_residual(h, h->mb + 16*index, 2, index, scan, s->qscale, 16) < 0 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4716 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
4717 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4718 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4719 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
4720 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
4721 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4722 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4723 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4724
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4725 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
4726 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
4727 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
4728 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-DC\n",c );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4729 if( decode_cabac_residual(h, h->mb + 256 + 16*4*c, 3, c, chroma_dc_scan, h->chroma_qp, 4) < 0)
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4730 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
4731 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4732 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4733
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4734 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
4735 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
4736 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
4737 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
4738 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
4739 //av_log( s->avctx, AV_LOG_ERROR, "INTRA C%d-AC %d\n",c, index - 16 );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4740 if( decode_cabac_residual(h, h->mb + 16*index, 4, index - 16, scan + 1, h->chroma_qp, 15) < 0)
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4741 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
4742 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4743 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4744 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4745 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
4746 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
4747 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
4748 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4749 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4750 memset( &h->non_zero_count_cache[8], 0, 8*5 );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4751 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4752
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4753 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
4754 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
4755
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4756 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
4757 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4758
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
4759
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
4760 static void filter_mb_edgev( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4761 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
4762 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
4763 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
4764 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
4765
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4766 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
4767 if( bS[i] == 0 ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4768 pix += 4 * stride;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4769 continue;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4770 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4771
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4772 if( bS[i] < 4 ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4773 const int tc0 = tc0_table[index_a][bS[i] - 1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4774 /* 4px edge length */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4775 for( d = 0; d < 4; d++ ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4776 const int p0 = pix[-1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4777 const int p1 = pix[-2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4778 const int p2 = pix[-3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4779 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4780 const int q1 = pix[1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4781 const int q2 = pix[2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4782
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4783 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4784 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4785 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4786 int tc = tc0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4787 int i_delta;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4788
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4789 if( ABS( p2 - p0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4790 pix[-2] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4791 tc++;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4792 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4793 if( ABS( q2 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4794 pix[1] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4795 tc++;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4796 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4797
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4798 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4799 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4800 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4801 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4802 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
4803 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4804 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4805 /* 4px edge length */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4806 for( d = 0; d < 4; d++ ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4807 const int p0 = pix[-1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4808 const int p1 = pix[-2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4809 const int p2 = pix[-3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4810
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4811 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4812 const int q1 = pix[1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4813 const int q2 = pix[2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4814
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4815 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4816 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4817 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4818
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4819 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4820 if( ABS( p2 - p0 ) < beta)
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4821 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4822 const int p3 = pix[-4];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4823 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4824 pix[-1] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4825 pix[-2] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4826 pix[-3] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4827 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4828 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4829 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4830 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4831 if( ABS( q2 - q0 ) < beta)
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4832 {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4833 const int q3 = pix[3];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4834 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4835 pix[0] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4836 pix[1] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4837 pix[2] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4838 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4839 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4840 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4841 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4842 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4843 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4844 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4845 pix[ 0] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4846 }
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
4847 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4848 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
4849 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4850 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4851 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4852 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4853 static void filter_mb_edgecv( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4854 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
4855 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
4856 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
4857 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
4858
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4859 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
4860 if( bS[i] == 0 ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4861 pix += 2 * stride;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4862 continue;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4863 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4864
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4865 if( bS[i] < 4 ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4866 const int tc = tc0_table[index_a][bS[i] - 1] + 1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4867 /* 2px edge length (because we use same bS than the one for luma) */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4868 for( d = 0; d < 2; d++ ){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4869 const int p0 = pix[-1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4870 const int p1 = pix[-2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4871 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4872 const int q1 = pix[1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4873
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4874 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4875 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4876 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4877 const int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4878
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4879 pix[-1] = clip_uint8( p0 + i_delta ); /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4880 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4881 }
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
4882 pix += stride;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4883 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4884 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4885 /* 2px edge length (because we use same bS than the one for luma) */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4886 for( d = 0; d < 2; d++ ){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4887 const int p0 = pix[-1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4888 const int p1 = pix[-2];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4889 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4890 const int q1 = pix[1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4891
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4892 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4893 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4894 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4895
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4896 pix[-1] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4897 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4898 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4899 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
4900 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4901 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4902 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4903 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4904
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4905 static void filter_mb_edgeh( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4906 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
4907 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
4908 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
4909 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
4910 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
4911
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4912 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
4913 if( bS[i] == 0 ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4914 pix += 4;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4915 continue;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4916 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4917
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4918 if( bS[i] < 4 ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4919 const int tc0 = tc0_table[index_a][bS[i] - 1];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4920 /* 4px edge length */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4921 for( d = 0; d < 4; d++ ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4922 const int p0 = pix[-1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4923 const int p1 = pix[-2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4924 const int p2 = pix[-3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4925 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4926 const int q1 = pix[1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4927 const int q2 = pix[2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4928
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4929 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4930 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4931 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4932
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4933 int tc = tc0;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4934 int i_delta;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4935
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4936 if( ABS( p2 - p0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4937 pix[-2*pix_next] = p1 + clip( ( p2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( p1 << 1 ) ) >> 1, -tc0, tc0 );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4938 tc++;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4939 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4940 if( ABS( q2 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4941 pix[pix_next] = q1 + clip( ( q2 + ( ( p0 + q0 + 1 ) >> 1 ) - ( q1 << 1 ) ) >> 1, -tc0, tc0 );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4942 tc++;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4943 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4944
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4945 i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4946 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4947 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4948 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4949 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
4950 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4951 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4952 /* 4px edge length */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4953 for( d = 0; d < 4; d++ ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4954 const int p0 = pix[-1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4955 const int p1 = pix[-2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4956 const int p2 = pix[-3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4957 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4958 const int q1 = pix[1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4959 const int q2 = pix[2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4960
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4961 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4962 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4963 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4964
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4965 const int p3 = pix[-4*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4966 const int q3 = pix[ 3*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4967
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4968 if(ABS( p0 - q0 ) < (( alpha >> 2 ) + 2 )){
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4969 if( ABS( p2 - p0 ) < beta) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4970 /* p0', p1', p2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4971 pix[-1*pix_next] = ( p2 + 2*p1 + 2*p0 + 2*q0 + q1 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4972 pix[-2*pix_next] = ( p2 + p1 + p0 + q0 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4973 pix[-3*pix_next] = ( 2*p3 + 3*p2 + p1 + p0 + q0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4974 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4975 /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4976 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4977 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4978 if( ABS( q2 - q0 ) < beta) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4979 /* q0', q1', q2' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4980 pix[0*pix_next] = ( p1 + 2*p0 + 2*q0 + 2*q1 + q2 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4981 pix[1*pix_next] = ( p0 + q0 + q1 + q2 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4982 pix[2*pix_next] = ( 2*q3 + 3*q2 + q1 + q0 + p0 + 4 ) >> 3;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4983 } else {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4984 /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4985 pix[0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4986 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4987 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4988 /* p0', q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4989 pix[-1*pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4990 pix[ 0*pix_next] = ( 2*q1 + q0 + p1 + 2 ) >> 2;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4991 }
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
4992 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
4993 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
4994 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4995 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4996 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4997 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4998
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
4999 static void filter_mb_edgech( H264Context *h, uint8_t *pix, int stride, int bS[4], int qp ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5000 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
5001 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
5002 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
5003 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
5004 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
5005
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5006 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
5007 {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5008 if( bS[i] == 0 ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5009 pix += 2;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5010 continue;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5011 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5012
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5013 if( bS[i] < 4 ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5014 int tc = tc0_table[index_a][bS[i] - 1] + 1;
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5015 /* 2px edge length (see deblocking_filter_edgecv) */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5016 for( d = 0; d < 2; d++ ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5017 const int p0 = pix[-1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5018 const int p1 = pix[-2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5019 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5020 const int q1 = pix[1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5021
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5022 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5023 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5024 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5025
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5026 int i_delta = clip( (((q0 - p0 ) << 2) + (p1 - q1) + 4) >> 3, -tc, tc );
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5027
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5028 pix[-pix_next] = clip_uint8( p0 + i_delta ); /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5029 pix[0] = clip_uint8( q0 - i_delta ); /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5030 }
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
5031 pix++;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5032 }
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5033 }else{
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5034 /* 2px edge length (see deblocking_filter_edgecv) */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5035 for( d = 0; d < 2; d++ ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5036 const int p0 = pix[-1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5037 const int p1 = pix[-2*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5038 const int q0 = pix[0];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5039 const int q1 = pix[1*pix_next];
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5040
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5041 if( ABS( p0 - q0 ) < alpha &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5042 ABS( p1 - p0 ) < beta &&
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5043 ABS( q1 - q0 ) < beta ) {
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5044
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5045 pix[-pix_next] = ( 2*p1 + p0 + q1 + 2 ) >> 2; /* p0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5046 pix[0] = ( 2*q1 + q0 + p1 + 2 ) >> 2; /* q0' */
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5047 }
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5048 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
5049 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5050 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5051 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5052 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5053
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5054 static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr) {
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5055 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
5056 const int mb_xy= mb_x + mb_y*s->mb_stride;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5057 int linesize, uvlinesize;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5058 int dir;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5059
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5060 /* FIXME Implement deblocking filter for field MB */
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5061 if( h->sps.mb_aff ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5062 return;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5063 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5064 linesize = s->linesize;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5065 uvlinesize = s->uvlinesize;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5066
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5067 /* 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
5068 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
5069 {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5070 int start = 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
5071 int 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
5072
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5073 /* test picture boundary */
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5074 if( ( dir == 0 && mb_x == 0 ) || ( dir == 1 && mb_y == 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
5075 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
5076 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5077 /* FIXME test slice boundary */
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5078 if( h->deblocking_filter == 2 ) {
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
5079 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5080
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5081 /* Calculate bS */
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5082 for( edge = start; edge < 4; edge++ ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5083 /* mbn_xy: neighbour macroblock (how that works for field ?) */
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5084 int mbn_xy = edge > 0 ? mb_xy : ( dir == 0 ? mb_xy -1 : mb_xy - s->mb_stride );
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5085 int bS[4];
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5086 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
5087
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5088 if( IS_INTRA( s->current_picture.mb_type[mb_xy] ) ||
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5089 IS_INTRA( s->current_picture.mb_type[mbn_xy] ) ) {
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5090 bS[0] = bS[1] = bS[2] = bS[3] = ( edge == 0 ? 4 : 3 );
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5091 } 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
5092 int i;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5093 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
5094 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
5095 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
5096 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
5097 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
5098
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5099 if( h->non_zero_count_cache[b_idx] != 0 ||
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5100 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
5101 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
5102 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5103 else if( h->slice_type == P_TYPE ) {
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5104 if( h->ref_cache[0][b_idx] != h->ref_cache[0][bn_idx] ||
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5105 ABS( h->mv_cache[0][b_idx][0] - h->mv_cache[0][bn_idx][0] ) >= 4 ||
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5106 ABS( h->mv_cache[0][b_idx][1] - h->mv_cache[0][bn_idx][1] ) >= 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
5107 bS[i] = 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
5108 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
5109 bS[i] = 0;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5110 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5111 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
5112 /* FIXME Add support for B frame */
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5113 return;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5114 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5115 }
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5116
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5117 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
5118 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
5119 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5120
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5121 /* Filter edge */
1899
379a18a7131f do loop filter immediatly after each macroblock is decoded instead of after a frame is decoded
michael
parents: 1898
diff changeset
5122 qp = ( s->qscale + 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
5123 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
5124 filter_mb_edgev( h, &img_y[4*edge], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5125 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
5126 int chroma_qp = ( h->chroma_qp +
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5127 get_chroma_qp( h, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5128 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
5129 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
5130 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5131 } 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
5132 filter_mb_edgeh( h, &img_y[4*edge*linesize], linesize, bS, qp );
1898
7d2907127da3 h264 loop filter optimizations
michael
parents: 1897
diff changeset
5133 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
5134 int chroma_qp = ( h->chroma_qp +
1897
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5135 get_chroma_qp( h, s->current_picture.qscale_table[mbn_xy] ) + 1 ) >> 1;
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5136 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
5137 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
5138 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5139 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5140 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5141 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5142 }
4e8ed93524f6 h264 loop filter for progressive I&P frames by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1892
diff changeset
5143
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5144 static int decode_slice(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5145 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5146 const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5147
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5148 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
5149
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5150 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
5151 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
5152
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5153 /* realign */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5154 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
5155
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5156 /* init cabac */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5157 ff_init_cabac_states( &h->cabac, ff_h264_lps_range, ff_h264_mps_state, ff_h264_lps_state, 64 );
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5158 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
5159 s->gb.buffer + get_bits_count(&s->gb)/8,
2116
48d9f86fb047 overread fix
michael
parents: 2110
diff changeset
5160 ( 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
5161 /* calculate pre-state */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5162 for( i= 0; i < 399; i++ ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5163 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
5164 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
5165 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
5166 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5167 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
5168
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5169 if( pre <= 63 )
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5170 h->cabac_state[i] = 2 * ( 63 - pre ) + 0;
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5171 else
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5172 h->cabac_state[i] = 2 * ( pre - 64 ) + 1;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5173 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5174
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5175 for(;;){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5176 int ret = decode_mb_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
5177 int eos = get_cabac_terminate( &h->cabac ); /* End of Slice flag */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5178
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
5179 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
5180
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5181 /* XXX: useless as decode_mb_cabac it doesn't support that ... */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5182 if( ret >= 0 && h->sps.mb_aff ) { //FIXME optimal? or let mb_decode decode 16x32 ?
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5183 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
5184
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
5185 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
5186 eos = get_cabac_terminate( &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
5187
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5188 hl_decode_mb(h);
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5189 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
5190 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5191
2116
48d9f86fb047 overread fix
michael
parents: 2110
diff changeset
5192 if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 1) {
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5193 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
5194 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
5195 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
5196 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5197
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5198 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
5199 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
5200 ff_draw_horiz_band(s, 16*s->mb_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
5201 if( ++s->mb_y >= s->mb_height ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5202 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
5203 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5204 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5205
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5206 if( eos || s->mb_y >= s->mb_height ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5207 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
5208 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
5209 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5210 #if 0
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5211 /* TODO test over-reading in cabac code */
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5212 else if( read too much in h->cabac ) {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5213 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
5214 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
5215 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5216 #endif
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5217 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5218
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5219 } else {
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5220 for(;;){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5221 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
5222
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
5223 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
5224
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5225 if(ret>=0 && h->sps.mb_aff){ //FIXME optimal? or let mb_decode decode 16x32 ?
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5226 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
5227 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
5228
2163
b25df257eab0 segfault fix
michael
parents: 2116
diff changeset
5229 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
5230 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
5231 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5232
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5233 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
5234 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
5235 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
5236
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5237 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
5238 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5239
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5240 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
5241 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
5242 ff_draw_horiz_band(s, 16*s->mb_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
5243 if(++s->mb_y >= s->mb_height){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5244 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
5245
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5246 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
5247 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
5248
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5249 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
5250 }else{
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5251 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
5252
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5253 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
5254 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5255 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5256 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5257
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5258 if(get_bits_count(&s->gb) >= s->gb.size_in_bits && s->mb_skip_run<=0){
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5259 if(get_bits_count(&s->gb) == s->gb.size_in_bits ){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5260 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
5261
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5262 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5263 }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
5264 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
5265
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5266 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5267 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5268 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5269 }
1908
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5270 }
e20fd60b215c h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1899
diff changeset
5271
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5272 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5273 for(;s->mb_y < s->mb_height; s->mb_y++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5274 for(;s->mb_x < s->mb_width; s->mb_x++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5275 int ret= decode_mb(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5276
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5277 hl_decode_mb(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5278
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5279 if(ret<0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5280 fprintf(stderr, "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5281 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
5282
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5283 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5284 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5285
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5286 if(++s->mb_x >= s->mb_width){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5287 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5288 if(++s->mb_y >= s->mb_height){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5289 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5290 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
5291
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5292 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5293 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5294 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
5295
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5296 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5297 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5298 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5299 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5300
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5301 if(get_bits_count(s->?gb) >= s->gb?.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5302 if(get_bits_count(s->gb) == s->gb.size_in_bits){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5303 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
5304
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5305 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5306 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5307 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
5308
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5309 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5310 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5311 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5312 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5313 s->mb_x=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5314 ff_draw_horiz_band(s, 16*s->mb_y, 16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5315 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5316 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5317 return -1; //not reached
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5318 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5319
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5320 static inline int decode_vui_parameters(H264Context *h, SPS *sps){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5321 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5322 int aspect_ratio_info_present_flag, aspect_ratio_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5323
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5324 aspect_ratio_info_present_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5325
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5326 if( aspect_ratio_info_present_flag ) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5327 aspect_ratio_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5328 if( aspect_ratio_idc == EXTENDED_SAR ) {
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
5329 sps->sar.num= get_bits(&s->gb, 16);
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
5330 sps->sar.den= get_bits(&s->gb, 16);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5331 }else if(aspect_ratio_idc < 16){
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
5332 sps->sar= pixel_aspect[aspect_ratio_idc];
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5333 }else{
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5334 av_log(h->s.avctx, AV_LOG_ERROR, "illegal aspect ratio\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5335 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5336 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5337 }else{
1548
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
5338 sps->sar.num=
dd544554ed42 AVRational
michael
parents: 1524
diff changeset
5339 sps->sar.den= 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5340 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5341 // 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
5342
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5343 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
5344 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
5345 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5346
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5347 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
5348 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
5349 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
5350 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
5351 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
5352 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
5353 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
5354 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5355 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5356
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5357 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
5358 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
5359 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
5360 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5361
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5362 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
5363 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
5364 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
5365 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
5366 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
5367 }
6d614374d907 Get H.264 frame rate from SPS/VUI patch by (Mns Rullgrd <mru at kth dot se>)
michael
parents: 2163
diff changeset
5368
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5369 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5370 | nal_hrd_parameters_present_flag |0 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5371 | if( nal_hrd_parameters_present_flag = = 1) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5372 | hrd_parameters( ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5373 | vcl_hrd_parameters_present_flag |0 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5374 | if( vcl_hrd_parameters_present_flag = = 1) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5375 | hrd_parameters( ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5376 | if( ( nal_hrd_parameters_present_flag = = 1 | || | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5377 | | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5378 |( vcl_hrd_parameters_present_flag = = 1 ) ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5379 | low_delay_hrd_flag |0 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5380 | bitstream_restriction_flag |0 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5381 | if( bitstream_restriction_flag ) { |0 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5382 | motion_vectors_over_pic_boundaries_flag |0 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5383 | max_bytes_per_pic_denom |0 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5384 | max_bits_per_mb_denom |0 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5385 | log2_max_mv_length_horizontal |0 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5386 | log2_max_mv_length_vertical |0 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5387 | num_reorder_frames |0 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5388 | max_dec_frame_buffering |0 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5389 | } | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5390 |} | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5391 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5392 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5393 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5394
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5395 static inline int decode_seq_parameter_set(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5396 MpegEncContext * const s = &h->s;
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5397 int profile_idc, level_idc;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5398 int sps_id, i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5399 SPS *sps;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5400
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5401 profile_idc= get_bits(&s->gb, 8);
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5402 get_bits1(&s->gb); //constraint_set0_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5403 get_bits1(&s->gb); //constraint_set1_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5404 get_bits1(&s->gb); //constraint_set2_flag
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5405 get_bits(&s->gb, 5); // reserved
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5406 level_idc= get_bits(&s->gb, 8);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5407 sps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5408
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5409 sps= &h->sps_buffer[ sps_id ];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5410 sps->profile_idc= profile_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5411 sps->level_idc= level_idc;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5412
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5413 sps->log2_max_frame_num= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5414 sps->poc_type= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5415
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5416 if(sps->poc_type == 0){ //FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5417 sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5418 } else if(sps->poc_type == 1){//FIXME #define
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5419 sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5420 sps->offset_for_non_ref_pic= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5421 sps->offset_for_top_to_bottom_field= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5422 sps->poc_cycle_length= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5423
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5424 for(i=0; i<sps->poc_cycle_length; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5425 sps->offset_for_ref_frame[i]= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5426 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5427 if(sps->poc_type > 2){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5428 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
5429 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5430 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5431
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5432 sps->ref_frame_count= get_ue_golomb(&s->gb);
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5433 sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5434 sps->mb_width= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5435 sps->mb_height= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5436 sps->frame_mbs_only_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5437 if(!sps->frame_mbs_only_flag)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5438 sps->mb_aff= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5439 else
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5440 sps->mb_aff= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5441
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5442 sps->direct_8x8_inference_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5443
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5444 sps->crop= get_bits1(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5445 if(sps->crop){
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5446 sps->crop_left = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5447 sps->crop_right = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5448 sps->crop_top = get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5449 sps->crop_bottom= get_ue_golomb(&s->gb);
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5450 if(sps->crop_left || sps->crop_top){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5451 av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completly supported, this could look slightly wrong ...\n");
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5452 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5453 }else{
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5454 sps->crop_left =
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5455 sps->crop_right =
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5456 sps->crop_top =
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5457 sps->crop_bottom= 0;
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5458 }
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5459
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5460 sps->vui_parameters_present_flag= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5461 if( sps->vui_parameters_present_flag )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5462 decode_vui_parameters(h, sps);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5463
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5464 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5465 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
5466 sps_id, sps->profile_idc, sps->level_idc,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5467 sps->poc_type,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5468 sps->ref_frame_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5469 sps->mb_width, sps->mb_height,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5470 sps->frame_mbs_only_flag ? "FRM" : (sps->mb_aff ? "MB-AFF" : "PIC-AFF"),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5471 sps->direct_8x8_inference_flag ? "8B8" : "",
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5472 sps->crop_left, sps->crop_right,
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5473 sps->crop_top, sps->crop_bottom,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5474 sps->vui_parameters_present_flag ? "VUI" : ""
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 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5478 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5479
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5480 static inline int decode_picture_parameter_set(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5481 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5482 int pps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5483 PPS *pps= &h->pps_buffer[pps_id];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5484
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5485 pps->sps_id= get_ue_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5486 pps->cabac= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5487 pps->pic_order_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5488 pps->slice_group_count= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5489 if(pps->slice_group_count > 1 ){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5490 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
5491 av_log(h->s.avctx, AV_LOG_ERROR, "FMO not supported\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5492 switch(pps->mb_slice_group_map_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5493 case 0:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5494 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5495 | for( i = 0; i <= num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5496 | run_length[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5497 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5498 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5499 case 2:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5500 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5501 | for( i = 0; i < num_slice_groups_minus1; i++ ) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5502 |{ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5503 | top_left_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5504 | bottom_right_mb[ i ] |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5505 | } | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5506 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5507 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5508 case 3:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5509 case 4:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5510 case 5:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5511 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5512 | slice_group_change_direction_flag |1 |u(1) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5513 | slice_group_change_rate_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5514 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5515 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5516 case 6:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5517 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5518 | slice_group_id_cnt_minus1 |1 |ue(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5519 | for( i = 0; i <= slice_group_id_cnt_minus1; i++ | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5520 |) | | |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5521 | slice_group_id[ i ] |1 |u(v) |
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5522 #endif
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1187
diff changeset
5523 break;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5524 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5525 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5526 pps->ref_count[0]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5527 pps->ref_count[1]= get_ue_golomb(&s->gb) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5528 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
5529 av_log(h->s.avctx, AV_LOG_ERROR, "reference overflow (pps)\n");
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5530 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5531 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5532
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5533 pps->weighted_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5534 pps->weighted_bipred_idc= get_bits(&s->gb, 2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5535 pps->init_qp= get_se_golomb(&s->gb) + 26;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5536 pps->init_qs= get_se_golomb(&s->gb) + 26;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5537 pps->chroma_qp_index_offset= get_se_golomb(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5538 pps->deblocking_filter_parameters_present= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5539 pps->constrained_intra_pred= get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5540 pps->redundant_pic_cnt_present = get_bits1(&s->gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5541
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5542 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5543 av_log(h->s.avctx, AV_LOG_DEBUG, "pps:%d sps:%d %s slice_groups:%d ref:%d/%d %s qp:%d/%d/%d %s %s %s\n",
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5544 pps_id, pps->sps_id,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5545 pps->cabac ? "CABAC" : "CAVLC",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5546 pps->slice_group_count,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5547 pps->ref_count[0], pps->ref_count[1],
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5548 pps->weighted_pred ? "weighted" : "",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5549 pps->init_qp, pps->init_qs, pps->chroma_qp_index_offset,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5550 pps->deblocking_filter_parameters_present ? "LPAR" : "",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5551 pps->constrained_intra_pred ? "CONSTR" : "",
1371
a0c0bee12abf bitstream changes to match JM7.2
michaelni
parents: 1341
diff changeset
5552 pps->redundant_pic_cnt_present ? "REDU" : ""
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5553 );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5554 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5555
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5556 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5557 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5558
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5559 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5560 * finds the end of the current frame in the bitstream.
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5561 * @return the position of the first byte of the next frame, or -1
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5562 */
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5563 static int find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){
1187
f3c659bfdb8e minor cleanup / some warning fixes
michaelni
parents: 1184
diff changeset
5564 int i;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5565 uint32_t state;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5566 //printf("first %02X%02X%02X%02X\n", buf[0], buf[1],buf[2],buf[3]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5567 // mb_addr= pc->mb_addr - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5568 state= pc->state;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5569 //FIXME this will fail with slices
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5570 for(i=0; i<buf_size; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5571 state= (state<<8) | buf[i];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5572 if((state&0xFFFFFF1F) == 0x101 || (state&0xFFFFFF1F) == 0x102 || (state&0xFFFFFF1F) == 0x105){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5573 if(pc->frame_start_found){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5574 pc->state=-1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5575 pc->frame_start_found= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5576 return i-3;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5577 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5578 pc->frame_start_found= 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5579 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5580 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5581
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5582 pc->state= state;
1219
michaelni
parents: 1214
diff changeset
5583 return END_NOT_FOUND;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5584 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5585
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5586 static int h264_parse(AVCodecParserContext *s,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5587 AVCodecContext *avctx,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5588 uint8_t **poutbuf, int *poutbuf_size,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5589 const uint8_t *buf, int buf_size)
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5590 {
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5591 ParseContext *pc = s->priv_data;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5592 int next;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5593
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5594 next= find_frame_end(pc, buf, buf_size);
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5595
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5596 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) {
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5597 *poutbuf = NULL;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5598 *poutbuf_size = 0;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5599 return buf_size;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5600 }
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5601
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5602 *poutbuf = (uint8_t *)buf;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5603 *poutbuf_size = buf_size;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5604 return next;
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5605 }
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5606
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5607 static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5608 MpegEncContext * const s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5609 AVCodecContext * const avctx= s->avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5610 int buf_index=0;
1322
f78341ab5fba some warning fixes
al3x
parents: 1319
diff changeset
5611 #if 0
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5612 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5613 for(i=0; i<32; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5614 printf("%X ", buf[i]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5615 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5616 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5617 for(;;){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5618 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5619 int dst_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5620 int bit_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5621 uint8_t *ptr;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5622 int i, nalsize = 0;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5623
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5624 if(h->is_avc) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5625 if(buf_index >= buf_size) break;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5626 nalsize = 0;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5627 for(i = 0; i < h->nal_length_size; i++)
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5628 nalsize = (nalsize << 8) | buf[buf_index++];
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5629 } else {
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5630 // start code prefix search
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5631 for(; buf_index + 3 < buf_size; buf_index++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5632 // this should allways succeed in the first iteration
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5633 if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5634 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5635 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5636
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5637 if(buf_index+3 >= buf_size) break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5638
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5639 buf_index+=3;
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5640 }
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5641
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5642 ptr= decode_nal(h, buf + buf_index, &dst_length, &consumed, buf_size - buf_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5643 if(ptr[dst_length - 1] == 0) dst_length--;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5644 bit_length= 8*dst_length - decode_rbsp_trailing(ptr + dst_length - 1);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5645
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5646 if(s->avctx->debug&FF_DEBUG_STARTCODE){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5647 av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d length %d\n", h->nal_unit_type, buf_index, dst_length);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5648 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5649
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5650 if (h->is_avc && (nalsize != consumed))
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5651 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
5652
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5653 buf_index += consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5654
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
5655 if( s->hurry_up == 1 && h->nal_ref_idc == 0 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5656 continue;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5657
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5658 switch(h->nal_unit_type){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5659 case NAL_IDR_SLICE:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5660 idr(h); //FIXME ensure we dont loose some frames if there is reordering
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5661 case NAL_SLICE:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5662 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5663 h->intra_gb_ptr=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5664 h->inter_gb_ptr= &s->gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5665 s->data_partitioning = 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5666
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5667 if(decode_slice_header(h) < 0) return -1;
1956
0eb2947f56f6 h264 hurry up fix and a tiny cabac clean patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
michael
parents: 1935
diff changeset
5668 if(h->redundant_pic_count==0 && s->hurry_up < 5 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5669 decode_slice(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5670 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5671 case NAL_DPA:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5672 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5673 h->intra_gb_ptr=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5674 h->inter_gb_ptr= NULL;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5675 s->data_partitioning = 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5676
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5677 if(decode_slice_header(h) < 0) return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5678 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5679 case NAL_DPB:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5680 init_get_bits(&h->intra_gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5681 h->intra_gb_ptr= &h->intra_gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5682 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5683 case NAL_DPC:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5684 init_get_bits(&h->inter_gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5685 h->inter_gb_ptr= &h->inter_gb;
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
5686
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
5687 if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning && s->hurry_up < 5 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5688 decode_slice(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5689 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5690 case NAL_SEI:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5691 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5692 case NAL_SPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5693 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5694 decode_seq_parameter_set(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5695
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5696 if(s->flags& CODEC_FLAG_LOW_DELAY)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5697 s->low_delay=1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5698
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5699 avctx->has_b_frames= !s->low_delay;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5700 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5701 case NAL_PPS:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5702 init_get_bits(&s->gb, ptr, bit_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5703
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5704 decode_picture_parameter_set(h);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5705
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5706 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5707 case NAL_PICTURE_DELIMITER:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5708 break;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5709 case NAL_FILTER_DATA:
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5710 break;
2099
acc845e25a68 some debug
alex
parents: 2028
diff changeset
5711 default:
acc845e25a68 some debug
alex
parents: 2028
diff changeset
5712 av_log(avctx, AV_LOG_ERROR, "Unknown NAL code: %d\n", h->nal_unit_type);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5713 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5714
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5715 //FIXME move after where irt is set
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5716 s->current_picture.pict_type= s->pict_type;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5717 s->current_picture.key_frame= s->pict_type == I_TYPE;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5718 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5719
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
5720 if(!s->current_picture_ptr) return buf_index; //no frame
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
5721
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5722 h->prev_frame_num_offset= h->frame_num_offset;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5723 h->prev_frame_num= h->frame_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5724 if(s->current_picture_ptr->reference){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5725 h->prev_poc_msb= h->poc_msb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5726 h->prev_poc_lsb= h->poc_lsb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5727 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5728 if(s->current_picture_ptr->reference)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5729 execute_ref_pic_marking(h, h->mmco, h->mmco_index);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5730 else
1169
4e891257d3e2 multiple reference frames support
michaelni
parents: 1168
diff changeset
5731 assert(h->mmco_index==0);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5732
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5733 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
5734
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5735 MPV_frame_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5736
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5737 return buf_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5738 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5739
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5740 /**
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5741 * retunrs the number of bytes consumed for building the current frame
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5742 */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5743 static int get_consumed_bytes(MpegEncContext *s, int pos, int buf_size){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5744 if(s->flags&CODEC_FLAG_TRUNCATED){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5745 pos -= s->parse_context.last_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5746 if(pos<0) pos=0; // FIXME remove (uneeded?)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5747
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5748 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5749 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5750 if(pos==0) pos=1; //avoid infinite loops (i doubt thats needed but ...)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5751 if(pos+10>buf_size) pos=buf_size; // oops ;)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5752
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5753 return pos;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5754 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5755 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5756
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5757 static int decode_frame(AVCodecContext *avctx,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5758 void *data, int *data_size,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5759 uint8_t *buf, int buf_size)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5760 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5761 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5762 MpegEncContext *s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5763 AVFrame *pict = data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5764 int buf_index;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5765
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5766 s->flags= avctx->flags;
1754
bdf3927bf8c5 closed gop support & flags2 as all bits in flags are used
michael
parents: 1706
diff changeset
5767 s->flags2= avctx->flags2;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5768
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5769 /* no supplementary picture */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5770 if (buf_size == 0) {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5771 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5772 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5773
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5774 if(s->flags&CODEC_FLAG_TRUNCATED){
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5775 int next= find_frame_end(&s->parse_context, buf, buf_size);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5776
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
5777 if( ff_combine_frame(&s->parse_context, next, &buf, &buf_size) < 0 )
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5778 return buf_size;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5779 //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
5780 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5781
2227
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5782 if(h->is_avc && !h->got_avcC) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5783 int i, cnt, nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5784 unsigned char *p = avctx->extradata;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5785 if(avctx->extradata_size < 7) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5786 av_log(avctx, AV_LOG_ERROR, "avcC too short\n");
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5787 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5788 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5789 if(*p != 1) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5790 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
5791 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5792 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5793 /* 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
5794 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
5795 h->nal_length_size = 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5796 // Decode sps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5797 cnt = *(p+5) & 0x1f; // Number of sps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5798 p += 6;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5799 for (i = 0; i < cnt; i++) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5800 nalsize = BE_16(p) + 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5801 if(decode_nal_units(h, p, nalsize) != nalsize) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5802 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
5803 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5804 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5805 p += nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5806 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5807 // Decode pps from avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5808 cnt = *(p++); // Number of pps
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5809 for (i = 0; i < cnt; i++) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5810 nalsize = BE_16(p) + 2;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5811 if(decode_nal_units(h, p, nalsize) != nalsize) {
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5812 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
5813 return -1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5814 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5815 p += nalsize;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5816 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5817 // 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
5818 h->nal_length_size = ((*(((char*)(avctx->extradata))+4))&0x03)+1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5819 // Do not reparse avcC
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5820 h->got_avcC = 1;
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5821 }
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5822
bf414a07af2e AVC (H264 in mp4 files, fourcc avc1) support
rtognimp
parents: 2200
diff changeset
5823 if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5824 if(0 < decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) )
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5825 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5826 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5827
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5828 buf_index=decode_nal_units(h, buf, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5829 if(buf_index < 0)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5830 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5831
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5832 //FIXME do something with unavailable reference frames
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5833
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5834 // if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_index, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5835 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5836 if(s->pict_type==B_TYPE || s->low_delay){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5837 *pict= *(AVFrame*)&s->current_picture;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5838 } else {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5839 *pict= *(AVFrame*)&s->last_picture;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5840 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5841 #endif
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
5842 if(!s->current_picture_ptr){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1548
diff changeset
5843 av_log(h->s.avctx, AV_LOG_DEBUG, "error, NO frame\n");
1174
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
5844 return -1;
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
5845 }
2de2a847af67 some checks to avoid segfault
michaelni
parents: 1170
diff changeset
5846
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5847 *pict= *(AVFrame*)&s->current_picture; //FIXME
1706
3ba5c493db6f motion vector vissualization improvements patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1698
diff changeset
5848 ff_print_debug_info(s, pict);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5849 assert(pict->data[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5850 //printf("out %d\n", (int)pict->data[0]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5851 #if 0 //?
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5852
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5853 /* Return the Picture timestamp as the frame number */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5854 /* we substract 1 because it is added on utils.c */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5855 avctx->frame_number = s->picture_number - 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5856 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5857 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5858 /* dont output the last pic after seeking */
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5859 if(s->last_picture_ptr || s->low_delay)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5860 //Note this isnt a issue as a IDR pic should flush teh buffers
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5861 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5862 *data_size = sizeof(AVFrame);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5863 return get_consumed_bytes(s, buf_index, buf_size);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5864 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5865 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5866 static inline void fill_mb_avail(H264Context *h){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5867 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
5868 const int mb_xy= s->mb_x + s->mb_y*s->mb_stride;
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5869
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5870 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
5871 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
5872 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
5873 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
5874 }else{
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5875 h->mb_avail[0]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5876 h->mb_avail[1]=
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5877 h->mb_avail[2]= 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5878 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5879 h->mb_avail[3]= s->mb_x && h->slice_table[mb_xy - 1] == h->slice_num;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5880 h->mb_avail[4]= 1; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5881 h->mb_avail[5]= 0; //FIXME move out
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5882 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5883 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5884
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5885 #if 0 //selftest
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5886 #define COUNT 8000
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5887 #define SIZE (COUNT*40)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5888 int main(){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5889 int i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5890 uint8_t temp[SIZE];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5891 PutBitContext pb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5892 GetBitContext gb;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5893 // int int_temp[10000];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5894 DSPContext dsp;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5895 AVCodecContext avctx;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5896
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5897 dsputil_init(&dsp, &avctx);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5898
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1453
diff changeset
5899 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5900 printf("testing unsigned exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5901 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5902 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5903 set_ue_golomb(&pb, i);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5904 STOP_TIMER("set_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5905 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5906 flush_put_bits(&pb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5907
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5908 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5909 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5910 int j, s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5911
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5912 s= show_bits(&gb, 24);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5913
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5914 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5915 j= get_ue_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5916 if(j != i){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5917 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5918 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5919 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5920 STOP_TIMER("get_ue_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5921 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5922
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5923
1524
alex
parents: 1522
diff changeset
5924 init_put_bits(&pb, temp, SIZE);
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5925 printf("testing signed exp golomb\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5926 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5927 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5928 set_se_golomb(&pb, i - COUNT/2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5929 STOP_TIMER("set_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5930 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5931 flush_put_bits(&pb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5932
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5933 init_get_bits(&gb, temp, 8*SIZE);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5934 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5935 int j, s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5936
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5937 s= show_bits(&gb, 24);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5938
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5939 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5940 j= get_se_golomb(&gb);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5941 if(j != i - COUNT/2){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5942 printf("missmatch! at %d (%d should be %d) bits:%6X\n", i, j, i, s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5943 // return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5944 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5945 STOP_TIMER("get_se_golomb");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5946 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5947
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5948 printf("testing 4x4 (I)DCT\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5949
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5950 DCTELEM block[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5951 uint8_t src[16], ref[16];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5952 uint64_t error= 0, max_error=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5953
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5954 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5955 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5956 // printf("%d %d %d\n", r1, r2, (r2-r1)*16);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5957 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5958 ref[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5959 src[j]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5960 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5961
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5962 h264_diff_dct_c(block, src, ref, 4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5963
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5964 //normalize
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5965 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5966 // printf("%d ", block[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5967 block[j]= block[j]*4;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5968 if(j&1) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5969 if(j&4) block[j]= (block[j]*4 + 2)/5;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5970 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5971 // printf("\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5972
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5973 h264_add_idct_c(ref, block, 4);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5974 /* for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5975 printf("%d ", ref[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5976 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5977 printf("\n");*/
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5978
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5979 for(j=0; j<16; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5980 int diff= ABS(src[j] - ref[j]);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5981
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5982 error+= diff*diff;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5983 max_error= FFMAX(max_error, diff);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5984 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5985 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5986 printf("error=%f max_error=%d\n", ((float)error)/COUNT/16, (int)max_error );
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5987 #if 0
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5988 printf("testing quantizer\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5989 for(qp=0; qp<52; qp++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5990 for(i=0; i<16; i++)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5991 src1_block[i]= src2_block[i]= random()%255;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5992
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5993 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5994 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5995 printf("Testing NAL layer\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5996
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5997 uint8_t bitstream[COUNT];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5998 uint8_t nal[COUNT*2];
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
5999 H264Context h;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6000 memset(&h, 0, sizeof(H264Context));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6001
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6002 for(i=0; i<COUNT; i++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6003 int zeros= i;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6004 int nal_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6005 int consumed;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6006 int out_length;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6007 uint8_t *out;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6008 int j;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6009
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6010 for(j=0; j<COUNT; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6011 bitstream[j]= (random() % 255) + 1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6012 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6013
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6014 for(j=0; j<zeros; j++){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6015 int pos= random() % COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6016 while(bitstream[pos] == 0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6017 pos++;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6018 pos %= COUNT;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6019 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6020 bitstream[pos]=0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6021 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6022
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6023 START_TIMER
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6024
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6025 nal_length= encode_nal(&h, nal, bitstream, COUNT, COUNT*2);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6026 if(nal_length<0){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6027 printf("encoding failed\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6028 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6029 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6030
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6031 out= decode_nal(&h, nal, &out_length, &consumed, nal_length);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6032
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6033 STOP_TIMER("NAL")
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6034
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6035 if(out_length != COUNT){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6036 printf("incorrect length %d %d\n", out_length, COUNT);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6037 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6038 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6039
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6040 if(consumed != nal_length){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6041 printf("incorrect consumed length %d %d\n", nal_length, consumed);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6042 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6043 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6044
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6045 if(memcmp(bitstream, out, COUNT)){
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6046 printf("missmatch\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6047 return -1;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6048 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6049 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6050
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6051 printf("Testing RBSP\n");
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6052
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6053
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6054 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6055 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6056 #endif
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6057
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6058
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6059 static int decode_end(AVCodecContext *avctx)
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6060 {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6061 H264Context *h = avctx->priv_data;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6062 MpegEncContext *s = &h->s;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6063
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6064 free_tables(h); //FIXME cleanup init stuff perhaps
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6065 MPV_common_end(s);
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6066
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6067 // memset(h, 0, sizeof(H264Context));
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6068
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6069 return 0;
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6070 }
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6071
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6072
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6073 AVCodec h264_decoder = {
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6074 "h264",
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6075 CODEC_TYPE_VIDEO,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6076 CODEC_ID_H264,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6077 sizeof(H264Context),
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6078 decode_init,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6079 NULL,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6080 decode_end,
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6081 decode_frame,
1214
327c5a36dfe7 fixing mixed dr1 + internal buffers
michaelni
parents: 1187
diff changeset
6082 /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED,
1168
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6083 };
5af9aeadbdc3 H264 decoder & demuxer
michaelni
parents:
diff changeset
6084
1988
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6085 AVCodecParser h264_parser = {
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6086 { CODEC_ID_H264 },
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6087 sizeof(ParseContext),
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6088 NULL,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6089 h264_parse,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6090 ff_parse_close,
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6091 };
b5753525f9a8 remove duplicated find_frame_end() code
michael
parents: 1957
diff changeset
6092
1234
fc2a7eefa9cc svq3 decoder by anonymous
michaelni
parents: 1219
diff changeset
6093 #include "svq3.c"